From 68545ceeb61cd833f6560156cf2ced9c9ecd6c43 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Wed, 16 Apr 2014 21:51:13 +0000 Subject: Dark schema: fixed code view, ACL window and preview --- view/theme/redbasic/css/style.css | 23 +++++++++++------ ..._black_diagonal_stripes_background_seamless.gif | Bin 0 -> 4970 bytes view/theme/redbasic/php/style.php | 28 +++++++++++++++++++-- view/theme/redbasic/schema/dark.php | 16 ++++++++++++ 4 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8d91e0169..60d0f4bc6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -92,9 +92,9 @@ code { font-family: Courier, monospace; display: block; overflow: auto; - border: 1px solid #444; - background: #EEE; - color: #444; + border: 1px solid $code_borderc; + background: $code_bgcolour; + color: $code_txtcolour; padding: 10px; margin-top: 20px; max-width: 80%; @@ -216,7 +216,7 @@ footer { } .preview { - background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); + background: url('../img/$preview_backgroundimg'); } #theme-preview { @@ -1592,6 +1592,10 @@ header { clear: both; } +.modal-content { + background-color: $acl_bgcolour; +} + #acl-search { margin-top: 20px; padding: 8px; @@ -1609,7 +1613,7 @@ header { #acl-list { display: block; - border: 1px solid #cccccc; + border: 1px solid $acl_bordercolour; overflow: auto; clear: both; min-height: 62px; @@ -1622,7 +1626,7 @@ header { .acl-list-item { width: calc(50% - 10px); - border: 1px solid #cccccc; + border: 1px solid $acl_bordercolour; margin: 0px 0px 10px 10px; padding: 5px; float: left; @@ -1658,6 +1662,11 @@ header { .acl-button-hide { float: right; margin-left: 5px; + $aclbutton_linkcolour +} + +#acl-showall { + $aclbutton_linkcolour } .contact-block-content { @@ -2109,7 +2118,7 @@ img.mail-list-sender-photo { } .abook-self { - background-color: #ffdddd; + background-color: $abookself_bgcolour; } .online-now { diff --git a/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif b/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif new file mode 100644 index 000000000..615c986bd Binary files /dev/null and b/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif differ diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 8984df788..f25d7228a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -137,6 +137,12 @@ if(! $a->install) { $blockquote_bgcolour = "#f4f8f9"; if (! $blockquote_bordercolour) $blockquote_bordercolour = "#dae4ee"; + if (! $code_borderc) + $code_borderc = "#444"; + if (! $code_bgcolour) + $code_bgcolour = "#EEE"; + if (! $code_txtcolour) + $code_txtcolour = "#444"; if (! $notif_itemcolour) $notif_itemcolour = "#000"; if (! $notif_itemhovercolour) @@ -147,6 +153,8 @@ if(! $a->install) { $editbuttons_bordercolour = "#ccc"; if (! $editbuttons_bghover) $editbuttons_bghover = "#ebebeb"; + if (! $preview_backgroundimg) + $preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif"; if (! $acpopup_bgcolour) $acpopup_bgcolour = "#fff"; if (! $acpopup_bordercolour) @@ -184,10 +192,18 @@ if(! $a->install) { if (! $shadow) $shadow = "0"; if(! $active_colour) - $active_colour = '#fff'; + $active_colour = "#fff"; if (! $converse_width) { - $converse_width="1024px"; + $converse_width = "1024px"; } + if (! $acl_bgcolour) + $acl_bgcolour = "#fff"; + if (! $acl_bordercolour) + $acl_bordercolour = "#ccc"; + if (! $aclbutton_linkcolour) + $aclbutton_linkcolour = ""; + if (! $abookself_bgcolour) + $abookself_bgcolour = "#ffdddd"; if(! $top_photo) $top_photo = '48px'; $pmenu_top = intval($top_photo) - 16 . 'px'; @@ -248,11 +264,15 @@ $options = array ( '$blockquote_bgcolour' => $blockquote_bgcolour, '$blockquote_bordercolour' => $blockquote_bordercolour, '$blockquote_bgcolourhover' => $blockquote_bgcolourhover, +'$code_borderc' => $code_borderc, +'$code_bgcolour' => $code_bgcolour, +'$code_txtcolour' => $code_txtcolour, '$notif_itemcolour' => $notif_itemcolour, '$notif_itemhovercolour' => $notif_itemhovercolour, '$editbuttons_bgcolour' => $editbuttons_bgcolour, '$editbuttons_bordercolour' => $editbuttons_bordercolour, '$editbuttons_bghover' => $editbuttons_bghover, +'$preview_backgroundimg' => $preview_backgroundimg, '$acpopup_bgcolour' => $acpopup_bgcolour, '$acpopup_bordercolour' => $acpopup_bordercolour, '$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour, @@ -273,6 +293,10 @@ $options = array ( '$shadow' => $shadow, '$active_colour' => $active_colour, '$converse_width' => $converse_width, +'$acl_bgcolour' => $acl_bgcolour, +'$acl_bordercolour' => $acl_bordercolour, +'$aclbutton_linkcolour' => $aclbutton_linkcolour, +'$abookself_bgcolour' => $abookself_bgcolour, '$nav_float_min_opacity' => $nav_float_min_opacity, '$nav_percent_min_opacity' => $nav_percent_min_opacity, '$top_photo' => $top_photo, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 27fbd26fc..1572ea9b0 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -56,6 +56,12 @@ $blockquote_bgcolour = "#1e1e1e"; if (! $blockquote_bordercolour) $blockquote_bordercolour = "#666"; + if (! $code_borderc) + $code_borderc = "#090909"; + if (! $code_bgcolour) + $code_bgcolour = "#000"; + if (! $code_txtcolour) + $code_txtcolour = "#fff"; if (! $item_bordercolour) $item_bordercolour = "#333"; if (! $notif_itemcolour) @@ -76,6 +82,8 @@ $editbuttons_bordercolour = "#222"; if (! $editbuttons_bghover) $editbuttons_bghover = "#222"; + if (! $preview_backgroundimg) + $preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif"; if (! $notify_bgcolour) $notify_bgcolour = "#000"; if (! $notify_linkcolour) @@ -100,3 +108,11 @@ $input_colourhover = "#fff"; if (! $input_decohover) $input_decohover = "underline"; + if (! $acl_bgcolour) + $acl_bgcolour = "#111"; + if (! $acl_bordercolour) + $acl_bordercolour = "#333"; + if (! $aclbutton_linkcolour) + $aclbutton_linkcolour = "color: #fff;"; + if (! $abookself_bgcolour) + $abookself_bgcolour = "#251111"; -- cgit v1.2.3