diff options
| author | friendica <info@friendica.com> | 2014-05-01 17:55:01 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-01 17:55:01 -0700 |
| commit | b9ae19c540e3664b4cc609b849da59ce27a1af91 (patch) | |
| tree | 309b677e36e8892847ac86e9e760efa003f7f0ca /view/theme/redbasic/php/style.php | |
| parent | b666aca5c39216270d3ba81b73cdb15d142cf20f (diff) | |
| parent | 4c9f5031eb5d59c3e637ac0f41af9721f331580d (diff) | |
| download | volse-hubzilla-b9ae19c540e3664b4cc609b849da59ce27a1af91.tar.gz volse-hubzilla-b9ae19c540e3664b4cc609b849da59ce27a1af91.tar.bz2 volse-hubzilla-b9ae19c540e3664b4cc609b849da59ce27a1af91.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/theme/redbasic/php/style.php')
| -rw-r--r-- | view/theme/redbasic/php/style.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 95ca5a4fe..05f7b96b0 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -126,8 +126,6 @@ if(! $a->install) { $toolicon_activecolour = '#000'; if (! $item_opacity) $item_opacity = "1"; - if (! $item_bordercolour) - $item_bordercolour = $item_colour; if (! $font_size) $font_size = "1.0em"; if (! $body_font_size) @@ -138,6 +136,8 @@ if(! $a->install) { $selected_active_colour = "#444"; if (! $selected_active_deco) $selected_active_deco = "none"; + if (! $widget_brdrcolour) + $widget_brdrcolour = "#eec"; if (! $blockquote_colour) $blockquote_colour = "#000"; if (! $blockquote_bgcolour) @@ -158,6 +158,8 @@ if(! $a->install) { $editbuttons_bgcolour = "transparent"; if (! $editbuttons_bordercolour) $editbuttons_bordercolour = "#ccc"; + if (! $editbuttons_colour) + $editbuttons_colour = "#333"; if (! $editbuttons_bghover) $editbuttons_bghover = "#ebebeb"; if (! $preview_backgroundimg) @@ -260,7 +262,6 @@ $options = array ( '$item_colour' => $item_colour, '$comment_item_colour' => $comment_item_colour, '$item_opacity' => $item_opacity, -'$item_bordercolour' => $item_bordercolour, '$toolicon_colour' => $toolicon_colour, '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, @@ -268,6 +269,7 @@ $options = array ( '$selected_active_colour' => $selected_active_colour, '$selected_active_deco' => $selected_active_deco, '$body_font_size' => $body_font_size, +'$widget_brdrcolour' => $widget_brdrcolour, '$blockquote_colour' => $blockquote_colour, '$blockquote_bgcolour' => $blockquote_bgcolour, '$blockquote_bordercolour' => $blockquote_bordercolour, @@ -279,6 +281,7 @@ $options = array ( '$notif_itemhovercolour' => $notif_itemhovercolour, '$editbuttons_bgcolour' => $editbuttons_bgcolour, '$editbuttons_bordercolour' => $editbuttons_bordercolour, +'$editbuttons_colour' => $editbuttons_colour, '$editbuttons_bghover' => $editbuttons_bghover, '$preview_backgroundimg' => $preview_backgroundimg, '$acpopup_bgcolour' => $acpopup_bgcolour, |