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

Added the display setting for generic (other) content wrapper. Also did set the default a bit lighter. See if that's ok.

Browse Source
This commit is contained in:
Jeroen 2014-10-09 20:55:44 +00:00
parent e06c3e5a91
commit 77fc267f73
8 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1861,7 +1861,7 @@ img.mail-list-sender-photo {
max-width: $converse_width;
}
.wall-item-content-wrapper, .generic-content-wrapper {
.wall-item-content-wrapper {
background-color: $item_colour;
padding: 10px;
border-top-right-radius: $radiuspx;
@ -1869,11 +1869,11 @@ img.mail-list-sender-photo {
}
.generic-content-wrapper {
border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx;
background-color: $genericcontent_bgcolour;
padding: 10px;
border-radius: $radiuspx;
}
.comment .wall-item-body {
padding-left: $comment_padding;
}

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

@ -25,6 +25,7 @@ function theme_content(&$a) {
$arr['comment_indent'] = get_pconfig(local_user(),'redbasic', 'comment_indent' );
$arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour');
$arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour');
$arr['genericcontent_bgcolour'] = get_pconfig(local_user(),'redbasic', 'genericcontent_bgcolour' );
$arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' );
$arr['body_font_size'] = get_pconfig(local_user(),'redbasic', 'body_font_size' );
$arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' );
@ -63,6 +64,7 @@ function theme_post(&$a) {
set_pconfig(local_user(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']);
set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
set_pconfig(local_user(), 'redbasic', 'genericcontent_bgcolour', $_POST['redbasic_genericcontent_bgcolour']);
set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
set_pconfig(local_user(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']);
set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
@ -120,6 +122,7 @@ if(feature_enabled(local_user(),'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']),
'$genericcontent_bgcolour' => array('redbasic_genericcontent_bgcolour',t('Set the background color of other content'),$arr['genericcontent_bgcolour']),
'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_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']),

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

@ -24,6 +24,7 @@ if(! $a->install) {
$background_image = get_pconfig($uid, "redbasic", "background_image");
$toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour');
$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
$genericcontent_bgcolour = get_pconfig($uid, "redbasic", "genericcontent_bgcolour");
$item_colour = get_pconfig($uid, "redbasic", "item_colour");
$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
@ -121,6 +122,8 @@ if(! $a->install) {
$bgcolour = "#fdfdfd";
if (! $background_image)
$background_image ='';
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour ='rgba(247,247,247,0.8)';
if (! $item_colour)
$item_colour = "rgba(238,238,238,0.8)";
if (! $comment_item_colour)
@ -331,6 +334,7 @@ $options = array (
'$search_background' => $search_background,
'$bgcolour' => $bgcolour,
'$background_image' => $background_image,
'$genericcontent_bgcolour' => $genericcontent_bgcolour,
'$item_colour' => $item_colour,
'$comment_item_colour' => $comment_item_colour,
'$comment_border_colour' => $comment_border_colour,

2
view/theme/redbasic/schema/dark.php
View File

@ -50,6 +50,8 @@
$search_background = "#999";
if (! $bgcolour)
$bgcolour = "#111";
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour ='rgba(28,28,28,0.8)';
if (! $item_colour)
$item_colour = "rgba(28,28,28,0.8)";
if (! $comment_item_colour)

4
view/theme/redbasic/schema/simple_black_on_white.php
View File

@ -34,7 +34,7 @@
$navtabs_bgchover = "#fff";
if (! $navtabs_decohover)
$navtabs_decohover = "underline";
if (! $navaside_bghover)
if (! $navaside_bghover)
$navaside_bghover = "#F5F5F5";
if (! $link_colour)
$link_colour = "#000";
@ -50,6 +50,8 @@ if (! $navaside_bghover)
$search_background = "#F5F5F5";
if (! $bgcolour)
$bgcolour = "#fff";
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour = 'rgba(255,255,255,0.8)';
if (! $item_colour)
$item_colour = "rgba(255,255,255,0.8)";
if (! $comment_item_colour)

2
view/theme/redbasic/schema/simple_green_on_black.php
View File

@ -50,6 +50,8 @@ if (! $navaside_bghover)
$search_background = "#000";
if (! $bgcolour)
$bgcolour = "#000";
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour = 'rgba(0,0,0,0.8)';
if (! $item_colour)
$item_colour = "rgba(0,0,0,0.8)";
if (! $comment_item_colour)

2
view/theme/redbasic/schema/simple_white_on_black.php
View File

@ -50,6 +50,8 @@
$search_background = "#000";
if (! $bgcolour)
$bgcolour = "#000";
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour ='rgba(0,0,0,0.8)';
if (! $item_colour)
$item_colour = "rgba(0,0,0,0.8)";
if (! $comment_item_colour)

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

@ -24,6 +24,7 @@
{{include file="field_input.tpl" field=$comment_indent}}
{{include file="field_colorinput.tpl" field=$toolicon_colour}}
{{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
{{include file="field_colorinput.tpl" field=$genericcontent_bgcolour}}
{{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}}
@ -40,7 +41,7 @@
$('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker();
$('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
$('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour,#id_redbasic_genericcontent_bgcolour').colorpicker({format: 'rgba'});
});
</script>