diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 8 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 3 |
8 files changed, 22 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 802daa6c9..57e24e746 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -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; } diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index bfef8216c..4c889008a 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -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']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 9e9ae17cd..104d9d51e 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -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, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 96600f9f6..f4222c07b 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -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) diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 42a62c5ba..2bf002bca 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -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) diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 641a46668..15adcf198 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -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) diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index 50379dfe4..96450d835 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -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) diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 70b42b6cd..73e0f3476 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -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> |