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

make every page regard max content width setting and move the setting out of experts mode

Browse Source
This commit is contained in:
Mario Vavti 2015-03-18 14:41:54 +01:00
parent 7a9aca6ecb
commit 8cb31172a9
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -24,6 +24,10 @@ body {
height: 100%; height: 100%;
} }
main {
max-width: $main_width;
}
h1, .h1, h2, .h2 { h1, .h1, h2, .h2 {
font-size: 1.667em; font-size: 1.667em;
} }
@ -301,7 +305,6 @@ footer {
} }
#profile-edit-links { #profile-edit-links {
max-width: $converse_width;
padding-top: 15px; padding-top: 15px;
padding-bottom: 15px; padding-bottom: 15px;
} }
@ -1608,10 +1611,6 @@ img.mail-list-sender-photo {
/* jot */ /* jot */
#profile-jot-wrapper {
max-width: $converse_width;
}
.jothidden { .jothidden {
font-weight: bold; font-weight: bold;
border-radius: $radiuspx; border-radius: $radiuspx;
@ -1680,10 +1679,6 @@ img.mail-list-sender-photo {
margin-left: $comment_indent; margin-left: $comment_indent;
} }
.thread-wrapper.toplevel_item {
max-width: $converse_width;
}
.wall-item-content-wrapper { .wall-item-content-wrapper {
background-color: $item_colour; background-color: $item_colour;
padding: 10px; 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']), '$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_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']), '$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_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']), '$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']), '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']),
'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), '$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_width' => array('redbasic_converse_width',t('Set maximum width of content region'),$arr['converse_width'], t('Example: 800px')),
'$converse_center' => array('redbasic_converse_center',t('Center conversation regions'),$arr['converse_center'], '', array(t('No'),t('Yes'))), '$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']), '$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']), '$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']), '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),

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

@ -304,7 +304,12 @@ if(! $a->install) {
if(file_exists('view/theme/redbasic/css/style.css')) { if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('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 + $converse_width);
// prevent main_width smaller than 768px
$main_width = (($main_width < 768) ? 768 : $main_width) . 'px';
$options = array ( $options = array (
'$nav_bg' => $nav_bg, '$nav_bg' => $nav_bg,
@ -412,7 +417,7 @@ $options = array (
'$pmenu_reply' => $pmenu_reply, '$pmenu_reply' => $pmenu_reply,
'$wwtop' => $wwtop, '$wwtop' => $wwtop,
'$comment_indent' => $comment_indent, '$comment_indent' => $comment_indent,
'$body_width' => $body_width, '$main_width' => $main_width,
'$comment_padding' => $comment_padding, '$comment_padding' => $comment_padding,
'$admintable_hoverbgcol' => $admintable_hoverbgcol, '$admintable_hoverbgcol' => $admintable_hoverbgcol,
'$dirpopup_txtcol' => $dirpopup_txtcol, '$dirpopup_txtcol' => $dirpopup_txtcol,

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

@ -28,9 +28,10 @@
{{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$shadow}}
{{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$top_photo}}
{{include file="field_input.tpl" field=$reply_photo}} {{include file="field_input.tpl" field=$reply_photo}}
{{/if}}
{{include file="field_input.tpl" field=$converse_width}} {{include file="field_input.tpl" field=$converse_width}}
{{include file="field_checkbox.tpl" field=$converse_center}} {{include file="field_checkbox.tpl" field=$converse_center}}
{{/if}}
{{include file="field_checkbox.tpl" field=$narrow_navbar}} {{include file="field_checkbox.tpl" field=$narrow_navbar}}
{{if $expert}} {{if $expert}}
<script> <script>