diff options
| author | friendica <info@friendica.com> | 2015-01-04 00:48:17 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-04 00:48:17 -0800 |
| commit | 9433a0ddc8926cc483521e97ae911d2eb82c91f6 (patch) | |
| tree | 2c61d0a769ff851f078bef76961dfa4f5923a394 /view/theme | |
| parent | 028dff44cccc27db4140ad41fc4893d6cd6ad0f0 (diff) | |
| parent | 753e6809d920f0205b49d45072c8a5bb687c1797 (diff) | |
| download | volse-hubzilla-9433a0ddc8926cc483521e97ae911d2eb82c91f6.tar.gz volse-hubzilla-9433a0ddc8926cc483521e97ae911d2eb82c91f6.tar.bz2 volse-hubzilla-9433a0ddc8926cc483521e97ae911d2eb82c91f6.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.php | 2 |
6 files changed, 12 insertions, 1 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 63cf27d58..7a6ceb968 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1978,7 +1978,7 @@ img.mail-list-sender-photo { .chat-item-text { border-radius: $radiuspx; - background-color: #eee; + background-color: $chat_txtbgcol; } /* nav bootstrap */ 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, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 51a6d23a4..0203d30cd 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -176,6 +176,8 @@ $advperm_gradientcol = "#1E1E1E"; if(! $cal_bgcolour) $cal_bgcolour = "#333"; + if(! $chat_txtbgcol) + $chat_txtbgcol = "#222"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#1E1E1E"; if (!$admintable_hoverbgcol) diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 2bf002bca..ddbcae495 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -176,6 +176,8 @@ $advperm_gradientcol = "#fff"; if(! $cal_bgcolour) $cal_bgcolour = "#fff"; + if(! $chat_txtbgcol) + $chat_txtbgcol = "#fff"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#fff"; if (!$admintable_hoverbgcol) diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 15adcf198..f034185f7 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -176,6 +176,8 @@ if (! $navaside_bghover) $advperm_gradientcol = "#000"; if(! $cal_bgcolour) $cal_bgcolour = "#000"; + if(! $chat_txtbgcol) + $chat_txtbgcol = "#000"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#000"; if (!$admintable_hoverbgcol) diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index 96450d835..95ede29ed 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -176,6 +176,8 @@ $advperm_gradientcol = "#000"; if(! $cal_bgcolour) $cal_bgcolour = "#000"; + if(! $chat_txtbgcol) + $chat_txtbgcol = "#000"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#000"; if (!$admintable_hoverbgcol) |