diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
| commit | f0c7612bcd49d32e408e67ac1829ee891c677f7e (patch) | |
| tree | d4cff4aa2d728524b631776ffffee71f42056421 /view/theme/redbasic/php | |
| parent | 43f143a211c75138d09ceb89acc48ea7d5c31ca9 (diff) | |
| parent | 10102ac2ac4d5b02012a9794e23656717ab05556 (diff) | |
| download | volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.gz volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.bz2 volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
Diffstat (limited to 'view/theme/redbasic/php')
| -rw-r--r-- | view/theme/redbasic/php/style.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 50ec9613b..5d44a9b9d 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -272,6 +272,8 @@ if(! $a->install) { $advperm_gradientcol = "#E8E8E8"; if(! $cal_bgcolour) $cal_bgcolour = "#FCF8E3"; + if(! $chat_txtbgcol) + $chat_txtbgcol = "#EEE"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#FFF"; if (!$comment_padding) @@ -409,6 +411,7 @@ $options = array ( '$advperm_bordercol' => $advperm_bordercol, '$advperm_gradientcol' => $advperm_gradientcol, '$cal_bgcolour' => $cal_bgcolour, +'$chat_txtbgcol' => $chat_txtbgcol, '$fancybox_bgcolour' => $fancybox_bgcolour, '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, |