aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/php/style.php
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-11 05:34:11 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-11 05:34:11 -0700
commitbde8c6d39e1ccf7a53569cc652a62b5447d3243f (patch)
tree598928300196120d90a28aac79e57d213dd61779 /view/theme/redbasic/php/style.php
parent7a106cf60cfa005ec6d8c35f922dc57b9af0175e (diff)
parent3d0d36b2bc6d134e1140b9fc8c40206be5bd7d2d (diff)
downloadvolse-hubzilla-bde8c6d39e1ccf7a53569cc652a62b5447d3243f.tar.gz
volse-hubzilla-bde8c6d39e1ccf7a53569cc652a62b5447d3243f.tar.bz2
volse-hubzilla-bde8c6d39e1ccf7a53569cc652a62b5447d3243f.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/redbasic/php/style.php')
-rw-r--r--view/theme/redbasic/php/style.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 01ca5a7b9..045ddc309 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -125,6 +125,8 @@ if(! $a->install) {
$item_colour = "rgba(238,238,238,0.8)";
if (! $comment_item_colour)
$comment_item_colour = "rgba(254,254,254,0.4)";
+ if (! $genericcontent_bgcolour)
+ $genericcontent_bgcolour = $comment_item_colour;
if (! $comment_border_colour)
$comment_border_colour = "rgba(238,238,238,0.8)";
if (! $toolicon_colour)
@@ -152,11 +154,11 @@ if(! $a->install) {
if (! $blockquote_bordercolour)
$blockquote_bordercolour = "#ccc";
if (! $code_borderc)
- $code_borderc = "#444";
+ $code_borderc = "#ccc";
if (! $code_bgcolour)
- $code_bgcolour = "#EEE";
+ $code_bgcolour = "#ccc";
if (! $code_txtcolour)
- $code_txtcolour = "#444";
+ $code_txtcolour = "#000";
if (! $pre_borderc)
$pre_borderc = "#ccc";
if (! $pre_bgcolour)
@@ -331,6 +333,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,