mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 02:35:12 +00:00
Merge https://github.com/friendica/red into pending_merge
This commit is contained in:
commit
3c024ee446
3 changed files with 14 additions and 5 deletions
|
@ -2184,6 +2184,10 @@ img.mail-list-sender-photo {
|
|||
background-color: $abookself_bgcolour;
|
||||
}
|
||||
|
||||
.abook-pending-contact, .abook-permschange {
|
||||
background: $abook_changebg;
|
||||
}
|
||||
|
||||
.online-now {
|
||||
color: red;
|
||||
cursor: pointer;
|
||||
|
|
|
@ -276,6 +276,8 @@ 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;
|
||||
|
@ -400,6 +402,7 @@ $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);
|
||||
|
|
|
@ -154,15 +154,15 @@
|
|||
$abookself_bgcolour = "#251111";
|
||||
if(! $infomess_bgcolour)
|
||||
$infomess_bgcolour = "#333";
|
||||
if(! $advperm_bgcolour)
|
||||
if(! $advperm_bgcolour)
|
||||
$advperm_bgcolour = "#1E1E1E";
|
||||
if(! $advperm_bordercol)
|
||||
if(! $advperm_bordercol)
|
||||
$advperm_bordercol = "#222";
|
||||
if(! $advperm_gradientcol)
|
||||
if(! $advperm_gradientcol)
|
||||
$advperm_gradientcol = "#111";
|
||||
if(! $cal_bgcolour)
|
||||
if(! $cal_bgcolour)
|
||||
$cal_bgcolour = "#333";
|
||||
if(! $fancybox_bgcolour)
|
||||
if(! $fancybox_bgcolour)
|
||||
$fancybox_bgcolour = "#1E1E1E";
|
||||
if (!$admintable_hoverbgcol)
|
||||
$admintable_hoverbgcol="#222";
|
||||
|
@ -170,3 +170,5 @@
|
|||
$dirpopup_txtcol="#111";
|
||||
if (!$dirpopup_linkcol)
|
||||
$dirpopup_linkcol="#000";
|
||||
if (!$abook_changebg)
|
||||
$abook_changebg="#402900";
|
||||
|
|
Loading…
Reference in a new issue