harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2015-03-18 12:28:18 -07:00
commit 3403c26ad5
7 changed files with 3000 additions and 2882 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4851
view/nl/messages.po
View File

File diff suppressed because it is too large Load Diff

990
view/nl/strings.php
View File

File diff suppressed because it is too large Load Diff

3
view/theme/redbasic/css/converse_center.css
View File

@ -1,5 +1,4 @@
body {
main {
margin-left: auto;
margin-right: auto;
max-width: $body_width;
}

13
view/theme/redbasic/css/style.css
View File

@ -24,6 +24,10 @@ body {
height: 100%;
}
main {
max-width: $main_width;
}
h1, .h1, h2, .h2 {
font-size: 1.667em;
}
@ -301,7 +305,6 @@ footer {
}
#profile-edit-links {
max-width: $converse_width;
padding-top: 15px;
padding-bottom: 15px;
}
@ -1608,10 +1611,6 @@ img.mail-list-sender-photo {
/* jot */
#profile-jot-wrapper {
max-width: $converse_width;
}
.jothidden {
font-weight: bold;
border-radius: $radiuspx;
@ -1680,10 +1679,6 @@ img.mail-list-sender-photo {
margin-left: $comment_indent;
}
.thread-wrapper.toplevel_item {
max-width: $converse_width;
}
.wall-item-content-wrapper {
background-color: $item_colour;
padding: 10px;

6
view/theme/redbasic/php/config.php
View File

@ -120,13 +120,13 @@ if(feature_enabled(local_channel(),'expert'))
'$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']),
'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']),
'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']),
'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size'], 'Example: 14px '),
'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size'], t('Example: 14px')),
'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']),
'$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
'$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']),
'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
'$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width'], 'Example: 700px ("center conversation regions" must be set to Yes for this to have an effect)'),
'$converse_center' => array('redbasic_converse_center',t('Center conversation regions'),$arr['converse_center'], '', array(t('No'),t('Yes'))),
'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
'$converse_center' => array('redbasic_converse_center',t('Center page content'),$arr['converse_center'], '', array(t('No'),t('Yes'))),
'$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']),
'$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),

11
view/theme/redbasic/php/style.php
View File

@ -244,7 +244,7 @@ if(! $a->install) {
if(! $active_colour)
$active_colour = "#fff";
if (! $converse_width) {
$converse_width = "1024px";
$converse_width = "1024";
}
if (! $acl_bgcolour)
$acl_bgcolour = "#fff";
@ -304,7 +304,12 @@ if(! $a->install) {
if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css');
$body_width = (231 + $converse_width) . 'px'; // aside is 231px + converse width; have to find a way for calculation with 'px', cannot handle '%'
// left aside is 231px + converse width
$main_width = (231 + intval($converse_width));
// prevent main_width smaller than 768px
$main_width = (($main_width < 768) ? 768 : $main_width) . 'px';
$options = array (
'$nav_bg' => $nav_bg,
@ -412,7 +417,7 @@ $options = array (
'$pmenu_reply' => $pmenu_reply,
'$wwtop' => $wwtop,
'$comment_indent' => $comment_indent,
'$body_width' => $body_width,
'$main_width' => $main_width,
'$comment_padding' => $comment_padding,
'$admintable_hoverbgcol' => $admintable_hoverbgcol,
'$dirpopup_txtcol' => $dirpopup_txtcol,

8
view/theme/redbasic/tpl/theme_settings.tpl
View File

@ -15,9 +15,7 @@
{{include file="field_colorinput.tpl" field=$comment_item_colour}}
{{include file="field_colorinput.tpl" field=$comment_border_colour}}
{{include file="field_input.tpl" field=$comment_indent}}
{{/if}}
{{include file="field_input.tpl" field=$body_font_size}}
{{if $expert}}
{{include file="field_input.tpl" field=$body_font_size}}
{{include file="field_input.tpl" field=$font_size}}
{{include file="field_colorinput.tpl" field=$font_colour}}
{{include file="field_colorinput.tpl" field=$link_colour}}
@ -28,9 +26,9 @@
{{include file="field_input.tpl" field=$shadow}}
{{include file="field_input.tpl" field=$top_photo}}
{{include file="field_input.tpl" field=$reply_photo}}
{{include file="field_input.tpl" field=$converse_width}}
{{include file="field_checkbox.tpl" field=$converse_center}}
{{/if}}
{{include file="field_input.tpl" field=$converse_width}}
{{include file="field_checkbox.tpl" field=$converse_center}}
{{include file="field_checkbox.tpl" field=$narrow_navbar}}
{{if $expert}}
<script>