diff options
| author | friendica <info@friendica.com> | 2014-05-02 17:30:33 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-02 17:30:33 -0700 |
| commit | f6bcc1dfc437f57d12c2da0fd9785bcf370bb0e2 (patch) | |
| tree | ac15f1f2b5d46885b6ebaa1d68756055c8deaa82 | |
| parent | 62b4ec4e75c6017e952444c104f3d5c6054dbe48 (diff) | |
| parent | f9d2a5f621fd9fc83d3d2668393f86c6a30fc477 (diff) | |
| download | volse-hubzilla-f6bcc1dfc437f57d12c2da0fd9785bcf370bb0e2.tar.gz volse-hubzilla-f6bcc1dfc437f57d12c2da0fd9785bcf370bb0e2.tar.bz2 volse-hubzilla-f6bcc1dfc437f57d12c2da0fd9785bcf370bb0e2.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | view/theme/redbasic/css/style.css | 8 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 12 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.php | 12 |
3 files changed, 30 insertions, 2 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 274ec50bc..ff051d673 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -100,6 +100,12 @@ code { max-width: 80%; } +pre { + background: $pre_bgcolour; + color: $pre_txtcolour; + border:1px solid $pre_borderc; +} + blockquote { background-color: $blockquote_bgcolour; border-left: 4px solid $blockquote_bordercolour; @@ -146,7 +152,7 @@ header { .info-message { font-size: 1.1em; border: 1px solid #444; - background-color: #F0F0F0; + background-color: $infomess_bgcolour; padding: 10px; -moz-border-radius: $radiuspx; border-radius: $radiuspx; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 998dfea32..ffae179e3 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -153,6 +153,12 @@ if(! $a->install) { $code_bgcolour = "#EEE"; if (! $code_txtcolour) $code_txtcolour = "#444"; + if (! $pre_borderc) + $pre_borderc = "#ccc"; + if (! $pre_bgcolour) + $pre_bgcolour = "#F5F5F5"; + if (! $pre_txtcolour) + $pre_txtcolour = "#333"; if (! $notif_itemcolour) $notif_itemcolour = "#000"; if (! $notif_itemhovercolour) @@ -224,6 +230,8 @@ if(! $a->install) { $comment_indent = '0px'; if(! $reply_photo) $reply_photo = '32px'; + if(! $infomess_bgcolour) + $infomess_bgcolour = "#F0F0F0"; if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; @@ -281,6 +289,9 @@ $options = array ( '$code_borderc' => $code_borderc, '$code_bgcolour' => $code_bgcolour, '$code_txtcolour' => $code_txtcolour, +'$pre_borderc' => $pre_borderc, +'$pre_bgcolour' => $pre_bgcolour, +'$pre_txtcolour' => $pre_txtcolour, '$notif_itemcolour' => $notif_itemcolour, '$notif_itemhovercolour' => $notif_itemhovercolour, '$editbuttons_bgcolour' => $editbuttons_bgcolour, @@ -317,6 +328,7 @@ $options = array ( '$nav_percent_min_opacity' => $nav_percent_min_opacity, '$top_photo' => $top_photo, '$reply_photo' => $reply_photo, +'$infomess_bgcolour' => $infomess_bgcolour, '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, '$wwtop' => $wwtop, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 78fd98d08..a90fe8367 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -50,6 +50,8 @@ $item_colour = "rgba(28,28,28,0.8)"; if (! $comment_item_colour) $comment_item_colour = "rgba(18,18,18,0.4)"; + if (! $comment_border_colour) + $comment_border_colour = "rgba(28,28,28,0.8)"; if (! $toolicon_colour) $toolicon_colour = '#999'; if (! $toolicon_activecolour) @@ -69,7 +71,13 @@ if (! $code_bgcolour) $code_bgcolour = "#000"; if (! $code_txtcolour) - $code_txtcolour = "#fff"; + $code_txtcolour = "#bbb"; + if (! $pre_borderc) + $pre_borderc = "#090909"; + if (! $pre_bgcolour) + $pre_bgcolour = "#000"; + if (! $pre_txtcolour) + $pre_txtcolour = "#bbb"; if (! $item_bordercolour) $item_bordercolour = "#333"; if (! $notif_itemcolour) @@ -128,3 +136,5 @@ $aclbutton_linkcolour = "color: #fff;"; if (! $abookself_bgcolour) $abookself_bgcolour = "#251111"; + if(! $infomess_bgcolour) + $infomess_bgcolour = "#333"; |