diff options
author | friendica <info@friendica.com> | 2014-06-12 17:32:06 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-06-12 17:32:06 -0700 |
commit | 4c743b0e15ea6344e70d327a182908bb0273e6ad (patch) | |
tree | 2604ac72dceb961e7e0f97837233a5797e94ebab /view/theme/redbasic | |
parent | 78609e936371788d4c822da1de1d2fc9a71fa7bc (diff) | |
parent | 0c51aae7687f6b61d3a6b38eed4c1956550cd138 (diff) | |
download | volse-hubzilla-4c743b0e15ea6344e70d327a182908bb0273e6ad.tar.gz volse-hubzilla-4c743b0e15ea6344e70d327a182908bb0273e6ad.tar.bz2 volse-hubzilla-4c743b0e15ea6344e70d327a182908bb0273e6ad.zip |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/theme/redbasic')
-rw-r--r-- | view/theme/redbasic/css/style.css | 35 | ||||
-rw-r--r-- | view/theme/redbasic/php/style.php | 15 | ||||
-rw-r--r-- | view/theme/redbasic/schema/dark.php | 10 |
3 files changed, 54 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b2d78c5a5..41f48141d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -556,9 +556,11 @@ aside li { .pager_last, .pager_prev, .pager_next, -.pager_n { - border: 1px solid black; - background: #EEE; +.pager-prev, +.pager-next, +.pager_n { + border: 1px solid $editbuttons_bordercolour; + background: $editbuttons_bgcolour; padding: 4px; } @@ -567,12 +569,11 @@ aside li { .pager_prev a, .pager_next a, .pager_n a { - text-decoration: none; } .pager_current { - border: 1px solid black; - background: #FFCCCC; + border: 1px solid transparent; + background: transparent; padding: 4px; } @@ -990,6 +991,15 @@ aside li { color: #FF0000; } +.fc-state-highlight { + background: none repeat scroll 0% 0% $cal_bgcolour !important; +} + +#fancybox-content { + border: 0px solid $fancybox_bgcolour; + background-color: $fancybox_bgcolour; +} + .settings-block { border: 1px solid #AAA; margin: 10px; @@ -2006,9 +2016,16 @@ img.mail-list-sender-photo { display: block; width: 100%; border-top: 1px dashed #ccc; + border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radiuspx; text-align: center; } +.divgrow-showmore:hover { + background-color: $editbuttons_bghover; +} + + /* widgets */ .widget { @@ -2288,6 +2305,12 @@ blockquote { text-decoration: none; } +.well { + background-color: $advperm_bgcolour; + border: 1px solid $advperm_bordercol; + background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%); +} + @media screen and (max-width: 767px) { aside#region_1 { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 950b43198..1165fab95 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -250,6 +250,16 @@ if(! $a->install) { $reply_photo = '32px'; if(! $infomess_bgcolour) $infomess_bgcolour = "#F0F0F0"; + if(! $advperm_bgcolour) + $advperm_bgcolour = "#F5F5F5"; + if(! $advperm_bordercol) + $advperm_bordercol = "#E3E3E3"; + if(! $advperm_gradientcol) + $advperm_gradientcol = "#E8E8E8"; + if(! $cal_bgcolour) + $cal_bgcolour = "#FCF8E3"; + if(! $fancybox_bgcolour) + $fancybox_bgcolour = "#FFF"; if (!$comment_padding) $comment_padding="0px"; if (!$comment_border_left) @@ -366,6 +376,11 @@ $options = array ( '$top_photo' => $top_photo, '$reply_photo' => $reply_photo, '$infomess_bgcolour' => $infomess_bgcolour, +'$advperm_bgcolour' => $advperm_bgcolour, +'$advperm_bordercol' => $advperm_bordercol, +'$advperm_gradientcol' => $advperm_gradientcol, +'$cal_bgcolour' => $cal_bgcolour, +'$fancybox_bgcolour' => $fancybox_bgcolour, '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, '$wwtop' => $wwtop, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 4bf22db78..4d53def95 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -154,3 +154,13 @@ $abookself_bgcolour = "#251111"; if(! $infomess_bgcolour) $infomess_bgcolour = "#333"; + if(! $advperm_bgcolour) + $advperm_bgcolour = "#1E1E1E"; + if(! $advperm_bordercol) + $advperm_bordercol = "#222"; + if(! $advperm_gradientcol) + $advperm_gradientcol = "#111"; + if(! $cal_bgcolour) + $cal_bgcolour = "#333"; + if(! $fancybox_bgcolour) + $fancybox_bgcolour = "#1E1E1E"; |