From 7b05c96dc5a147631f600437217a131b914e7f23 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 20 Mar 2015 13:12:55 +0100 Subject: remove more $vars from style.css --- view/theme/redbasic/css/style.css | 42 +++----------- view/theme/redbasic/php/style.php | 49 +---------------- view/theme/redbasic/schema/dark.css | 64 ++++++++++++++++++++++ view/theme/redbasic/schema/dark.php | 27 +-------- .../redbasic/schema/simple_black_on_white.css | 64 ++++++++++++++++++++++ .../redbasic/schema/simple_black_on_white.php | 29 +--------- .../redbasic/schema/simple_green_on_black.css | 63 +++++++++++++++++++++ .../redbasic/schema/simple_green_on_black.php | 34 ++---------- .../redbasic/schema/simple_white_on_black.css | 64 ++++++++++++++++++++++ .../redbasic/schema/simple_white_on_black.php | 29 +--------- 10 files changed, 276 insertions(+), 189 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f1807da83..f72b8a0bb 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -106,15 +106,15 @@ textarea { input { padding: 5px; line-height: 1.5; - border: 1px solid $input_border; + border: 1px solid #ccc; -moz-border-radius: $radiuspx; border-radius: $radiuspx; } input[type="submit"] { - background-color: $input_bgsubmit; + background-color: #F0F0F0; font-weight: bold; - color: $input_linksubmit; + color: #0080FF; text-decoration: none; padding: 6px 12px; } @@ -524,8 +524,8 @@ footer { .pager-prev, .pager-next, .pager_n { - border: 1px solid $editbuttons_bordercolour; - background: $editbuttons_bgcolour; + border: 1px solid #ccc; + background: transparent; padding: 4px; } @@ -1365,10 +1365,6 @@ header { clear: both; } -.modal-content { - background-color: $acl_bgcolour; -} - #acl-search { margin-top: 20px; padding: 8px; @@ -1386,7 +1382,7 @@ header { #acl-list { display: block; - border: 1px solid $acl_bordercolour; + border: 1px solid #ccc; overflow: auto; clear: both; min-height: 62px; @@ -1400,7 +1396,7 @@ header { .acl-list-item { width: 48%; /* fallback if browser does not support calc() */ width: calc(50% - 10px); - border: 1px solid $acl_bordercolour; + border: 1px solid #ccc; margin: 0px 0px 10px 10px; padding: 5px; float: left; @@ -1436,11 +1432,6 @@ header { .acl-button-hide { float: right; margin-left: 5px; - $aclbutton_linkcolour -} - -#acl-showall { - $aclbutton_linkcolour } .contact-block-content { @@ -1841,7 +1832,7 @@ img.mail-list-sender-photo { } .abook-self { - background-color: $abookself_bgcolour; + background-color: #ffdddd; } .abook-pending-contact, .abook-permschange { @@ -2168,22 +2159,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { } .btn-default { - background-color: $editbuttons_bgcolour; - border-color: $editbuttons_bordercolour; - color: $editbuttons_colour; - text-shadow: none; - box-shadow: none; -} - -.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { - background-color: $editbuttons_bghover; - border-color: $editbuttons_bordercolourhover; - color: $input_colourhover; - text-decoration: $input_decohover; -} - -.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { - text-decoration: none; + background-color: transparent; } @media screen and (max-width: 767px) { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 76fad1b18..c2e092d03 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -174,16 +174,6 @@ if(! $a->install) { $notif_itemcolour = "#000"; if (! $notif_itemhovercolour) $notif_itemhovercolour = "#000"; - if (! $editbuttons_bgcolour) - $editbuttons_bgcolour = "transparent"; - if (! $editbuttons_bordercolour) - $editbuttons_bordercolour = "#ccc"; - if (! $editbuttons_bordercolourhover) - $editbuttons_bordercolourhover = "#adadad"; - if (! $editbuttons_colour) - $editbuttons_colour = "#333"; - if (! $editbuttons_bghover) - $editbuttons_bghover = "#ebebeb"; if (! $dropdown_bgcolour) $dropdown_bgcolour = "#FFF"; if (! $dropdown_textcolour) @@ -226,42 +216,22 @@ if(! $a->install) { $notifyseen_linkhover = "#333"; if (! $notify_topmargin) $notify_topmargin = "1px"; - if (! $input_bgsubmit) - $input_bgsubmit = "#F0F0F0"; - if (! $input_linksubmit) - $input_linksubmit = "#0080FF"; - if (! $input_border) - $input_border = "#ccc"; - if (! $input_colourhover) - $input_colourhover = "#333"; - if (! $input_decohover) - $input_decohover = "none"; + + if (! $radius) $radius = "4"; if (! $shadow) $shadow = "0"; if(! $active_colour) $active_colour = "#fff"; - if (! $converse_width) { + if (! $converse_width) $converse_width = "1024"; - } - 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'; if(! $comment_indent) $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; @@ -331,11 +301,6 @@ $options = array ( '$pre_txtcolour' => $pre_txtcolour, '$notif_itemcolour' => $notif_itemcolour, '$notif_itemhovercolour' => $notif_itemhovercolour, -'$editbuttons_bgcolour' => $editbuttons_bgcolour, -'$editbuttons_bordercolour' => $editbuttons_bordercolour, -'$editbuttons_bordercolourhover' => $editbuttons_bordercolourhover, -'$editbuttons_colour' => $editbuttons_colour, -'$editbuttons_bghover' => $editbuttons_bghover, '$dropdown_bgcolour' => $dropdown_bgcolour, '$dropdown_textcolour' => $dropdown_textcolour, '$dropdown_txtcolhover' => $dropdown_txtcolhover, @@ -359,22 +324,14 @@ $options = array ( '$notify_topmargin' => $notify_topmargin, '$input_bgsubmit' => $input_bgsubmit, '$input_linksubmit' => $input_linksubmit, -'$input_border' => $input_border, -'$input_colourhover' => $input_colourhover, -'$input_decohover' => $input_decohover, '$radius' => $radius, '$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, '$reply_photo' => $reply_photo, -'$infomess_bgcolour' => $infomess_bgcolour, '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, '$comment_indent' => $comment_indent, diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index e64add844..7af859db6 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -51,3 +51,67 @@ border-color: #444; background-image: linear-gradient(to bottom, #333 0px, #333 100%); } + +.abook-self { + background-color: #251111; +} + +.acl-button-show, +.acl-button-hide { + color: #fff; +} + +#acl-showall { + color: #fff; +} + +#acl-list { + border: 1px solid #333; +} + +.acl-list-item { + border: 1px solid #333; +} + +.modal-content { + background-color: #111; +} + +.btn-default { + background-color: #1e1e1e; + border-color: #222; + color: #ccc; + text-shadow: none; + box-shadow: none; +} + +.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { + background-color: #222; + border-color: #222; + color: #fff; + text-decoration: underline; +} + +.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { + text-decoration: none; +} + +.pager_first, +.pager_last, +.pager_prev, +.pager_next, +.pager-prev, +.pager-next, +.pager_n { + border: 1px solid #222; + background: #1e1e1e; +} + +input { + border: 1px solid #222; +} + +input[type="submit"] { + background-color: #333; + color: #fff; +} diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index bd213de34..b6cc53504 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -96,12 +96,6 @@ $acpopup_tgbl_bgcolour = "#333"; if (! $acpopup_hovercolour) $acpopup_hovercolour = "#fff"; - if (! $editbuttons_bgcolour) - $editbuttons_bgcolour = "#1e1e1e"; - if (! $editbuttons_bordercolour) - $editbuttons_bordercolour = "#222"; - if (! $editbuttons_colour) - $editbuttons_colour = "#ccc"; if (! $editbuttons_bghover) $editbuttons_bghover = "#222"; if (! $dropdown_bgcolour) @@ -138,23 +132,4 @@ $notifyseen_bghover = "#222"; if (! $notifyseen_linkhover) $notifyseen_linkhover = "#CCC"; - if (! $input_bgsubmit) - $input_bgsubmit = "#333"; - if (! $input_linksubmit) - $input_linksubmit = "#fff"; - if (! $input_border) - $input_border = "#222"; - if (! $input_colourhover) - $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"; - if(! $infomess_bgcolour) - $infomess_bgcolour = "#333"; + diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index 1a29ed6f2..e23053858 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -51,3 +51,67 @@ border-color: #000; background-image: linear-gradient(to bottom, #fff 0px, #fff 100%); } + +.abook-self { + background-color: #fff; +} + +.acl-button-show, +.acl-button-hide { + color: #000; +} + +#acl-showall { + color: #000; +} + +#acl-list { + border: 1px solid #fff; +} + +.acl-list-item { + border: 1px solid #fff; +} + +.modal-content { + background-color: #fff; +} + +.btn-default { + background-color: #fff; + border-color: #000; + color: #111; + text-shadow: none; + box-shadow: none; +} + +.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { + background-color: #fff; + border-color: #000; + color: #000; + text-decoration: underline; +} + +.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { + text-decoration: none; +} + +.pager_first, +.pager_last, +.pager_prev, +.pager_next, +.pager-prev, +.pager-next, +.pager_n { + border: 1px solid #000; + background: #fff; +} + +input { + border: 1px solid #000; +} + +input[type="submit"] { + background-color: #fff; + color: #000; +} diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 55e92f9e6..76db1bb1f 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -96,14 +96,6 @@ $acpopup_tgbl_bgcolour = "#fff"; if (! $acpopup_hovercolour) $acpopup_hovercolour = "#000"; - if (! $editbuttons_bgcolour) - $editbuttons_bgcolour = "#fff"; - if (! $editbuttons_bordercolour) - $editbuttons_bordercolour = "#000"; - if (! $editbuttons_colour) - $editbuttons_colour = "#111"; - if (! $editbuttons_bghover) - $editbuttons_bghover = "#fff"; if (! $dropdown_bgcolour) $dropdown_bgcolour = "#fff"; if (! $dropdown_textcolour) @@ -138,23 +130,4 @@ $notifyseen_bghover = "#fff"; if (! $notifyseen_linkhover) $notifyseen_linkhover = "#000"; - if (! $input_bgsubmit) - $input_bgsubmit = "#fff"; - if (! $input_linksubmit) - $input_linksubmit = "#000"; - if (! $input_border) - $input_border = "#000"; - if (! $input_colourhover) - $input_colourhover = "#000"; - if (! $input_decohover) - $input_decohover = "underline"; - if (! $acl_bgcolour) - $acl_bgcolour = "#fff"; - if (! $acl_bordercolour) - $acl_bordercolour = "#fff"; - if (! $aclbutton_linkcolour) - $aclbutton_linkcolour = "color: #000;"; - if (! $abookself_bgcolour) - $abookself_bgcolour = "#fff"; - if(! $infomess_bgcolour) - $infomess_bgcolour = "#fff"; + diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index 4828eb249..f9bde2a71 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -52,3 +52,66 @@ background-image: linear-gradient(to bottom, #000 0px, #000 100%); } +.abook-self { + background-color: #000; +} + +.acl-button-show, +.acl-button-hide { + color: #fff; +} + +#acl-showall { + color: #fff; +} + +#acl-list { + border: 1px solid #000; +} + +.acl-list-item { + border: 1px solid #000; +} + +.modal-content { + background-color: #000; +} + +.btn-default { + background-color: #000; + border-color: #143D12; + color: #32962D; + text-shadow: none; + box-shadow: none; +} + +.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { + background-color: #000; + border-color: #143D12; + color: #50f148; + text-decoration: underline; +} + +.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { + text-decoration: none; +} + +.pager_first, +.pager_last, +.pager_prev, +.pager_next, +.pager-prev, +.pager-next, +.pager_n { + border: 1px solid #143D12; + background: #000; +} + +input { + border: 1px solid #143D12; +} + +input[type="submit"] { + background-color: #000; + color: #50f148; +} diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 3ec642526..8c8a58619 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -96,14 +96,6 @@ if (! $navaside_bghover) $acpopup_tgbl_bgcolour = "#000"; if (! $acpopup_hovercolour) $acpopup_hovercolour = "#50f148"; - if (! $editbuttons_bgcolour) - $editbuttons_bgcolour = "#000"; - if (! $editbuttons_bordercolour) - $editbuttons_bordercolour = "#143D12"; - if (! $editbuttons_colour) - $editbuttons_colour = "#32962D"; - if (! $editbuttons_bghover) - $editbuttons_bghover = "#000"; if (! $dropdown_bgcolour) $dropdown_bgcolour = "#000"; if (! $dropdown_textcolour) @@ -138,23 +130,9 @@ if (! $navaside_bghover) $notifyseen_bghover = "#000"; if (! $notifyseen_linkhover) $notifyseen_linkhover = "#50f148"; - if (! $input_bgsubmit) - $input_bgsubmit = "#000"; - if (! $input_linksubmit) - $input_linksubmit = "#50f148"; - if (! $input_border) - $input_border = "#143D12"; - if (! $input_colourhover) - $input_colourhover = "#50f148"; - if (! $input_decohover) - $input_decohover = "underline"; - if (! $acl_bgcolour) - $acl_bgcolour = "#000"; - if (! $acl_bordercolour) - $acl_bordercolour = "#000"; - if (! $aclbutton_linkcolour) - $aclbutton_linkcolour = "color: #fff;"; - if (! $abookself_bgcolour) - $abookself_bgcolour = "#000"; - if(! $infomess_bgcolour) - $infomess_bgcolour = "#000"; + + + + + + diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index 0367eb5f4..0a6c17f1b 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -52,3 +52,67 @@ border-color: #fff; background-image: linear-gradient(to bottom, #000 0px, #000 100%); } + +.abook-self { + background-color: #000; +} + +.acl-button-show, +.acl-button-hide { + color: #fff; +} + +#acl-showall { + color: #fff; +} + +#acl-list { + border: 1px solid #000; +} + +.acl-list-item { + border: 1px solid #000; +} + +.modal-content { + background-color: #000; +} + +.btn-default { + background-color: #000; + border-color: #fff; + color: #eee; + text-shadow: none; + box-shadow: none; +} + +.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { + background-color: #000; + border-color: #fff; + color: #fff; + text-decoration: underline; +} + +.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { + text-decoration: none; +} + +.pager_first, +.pager_last, +.pager_prev, +.pager_next, +.pager-prev, +.pager-next, +.pager_n { + border: 1px solid #fff; + background: #000; +} + +input { + border: 1px solid #fff; +} + +input[type="submit"] { + background-color: #000; + color: #fff; +} diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index 5f61326e4..29b176b09 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -96,14 +96,6 @@ $acpopup_tgbl_bgcolour = "#000"; if (! $acpopup_hovercolour) $acpopup_hovercolour = "#fff"; - if (! $editbuttons_bgcolour) - $editbuttons_bgcolour = "#000"; - if (! $editbuttons_bordercolour) - $editbuttons_bordercolour = "#fff"; - if (! $editbuttons_colour) - $editbuttons_colour = "#eee"; - if (! $editbuttons_bghover) - $editbuttons_bghover = "#000"; if (! $dropdown_bgcolour) $dropdown_bgcolour = "#000"; if (! $dropdown_textcolour) @@ -138,23 +130,4 @@ $notifyseen_bghover = "#000"; if (! $notifyseen_linkhover) $notifyseen_linkhover = "#fff"; - if (! $input_bgsubmit) - $input_bgsubmit = "#000"; - if (! $input_linksubmit) - $input_linksubmit = "#fff"; - if (! $input_border) - $input_border = "#fff"; - if (! $input_colourhover) - $input_colourhover = "#fff"; - if (! $input_decohover) - $input_decohover = "underline"; - if (! $acl_bgcolour) - $acl_bgcolour = "#000"; - if (! $acl_bordercolour) - $acl_bordercolour = "#000"; - if (! $aclbutton_linkcolour) - $aclbutton_linkcolour = "color: #fff;"; - if (! $abookself_bgcolour) - $abookself_bgcolour = "#000"; - if(! $infomess_bgcolour) - $infomess_bgcolour = "#000"; + -- cgit v1.2.3