From db355db9a6fe2bb369ca464391a010d992b72447 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Mar 2015 15:33:15 +0100 Subject: remove $abook_changebg from style.css --- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/php/style.php | 4 +--- view/theme/redbasic/schema/dark.css | 4 +++- view/theme/redbasic/schema/dark.php | 2 -- view/theme/redbasic/schema/simple_black_on_white.css | 4 +++- view/theme/redbasic/schema/simple_black_on_white.php | 2 -- view/theme/redbasic/schema/simple_green_on_black.css | 4 ++++ view/theme/redbasic/schema/simple_green_on_black.php | 2 -- view/theme/redbasic/schema/simple_white_on_black.css | 3 +++ view/theme/redbasic/schema/simple_white_on_black.php | 2 -- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d3d3882e4..a7f2a6754 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1853,7 +1853,7 @@ img.mail-list-sender-photo { } .abook-pending-contact, .abook-permschange { - background: $abook_changebg; + background: orange; } .online-now { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index a18812857..c71c1110b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -288,8 +288,7 @@ if(! $a->install) { $dirpopup_txtcol=""; if (!$dirpopup_linkcol) $dirpopup_linkcol=""; - if (!$abook_changebg) - $abook_changebg="orange"; + if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; @@ -422,7 +421,6 @@ $options = array ( '$admintable_hoverbgcol' => $admintable_hoverbgcol, '$dirpopup_txtcol' => $dirpopup_txtcol, '$dirpopup_linkcol' => $dirpopup_linkcol, -'$abook_changebg' => $abook_changebg, ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 853cd35a3..6817f756f 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -10,4 +10,6 @@ border-bottom: 1px solid #333; } - +.abook-pending-contact, .abook-permschange { + background: #402900; +} diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 3f462a311..93aa3ecf8 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -184,5 +184,3 @@ $dirpopup_txtcol="#111"; if (!$dirpopup_linkcol) $dirpopup_linkcol="#000"; - if (!$abook_changebg) - $abook_changebg="#402900"; diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index 6db85e19d..3242f3543 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -10,4 +10,6 @@ border-bottom: 1px solid #fff; } - +.abook-pending-contact, .abook-permschange { + background: #fff; +} diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 7c8a18217..c34bd8d5d 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -184,5 +184,3 @@ $dirpopup_txtcol="#fff"; if (!$dirpopup_linkcol) $dirpopup_linkcol="#fff"; - if (!$abook_changebg) - $abook_changebg="#fff"; diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index 5360fceb4..439e460aa 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -10,4 +10,8 @@ border-bottom: 1px solid #000; } +.abook-pending-contact, .abook-permschange { + background: #000; +} + diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index eedd6b2b7..f07a21af9 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -184,5 +184,3 @@ if (! $navaside_bghover) $dirpopup_txtcol="#000"; if (!$dirpopup_linkcol) $dirpopup_linkcol="#000"; - if (!$abook_changebg) - $abook_changebg="#000"; diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index 5360fceb4..c6820ba8c 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -10,4 +10,7 @@ border-bottom: 1px solid #000; } +.abook-pending-contact, .abook-permschange { + background: #000; +} diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index beef5e49e..5ac9aa3a1 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -184,5 +184,3 @@ $dirpopup_txtcol="#000"; if (!$dirpopup_linkcol) $dirpopup_linkcol="#000"; - if (!$abook_changebg) - $abook_changebg="#000"; -- cgit v1.2.3