diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-11 06:42:11 +0200 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-11 06:42:11 +0200 |
commit | edb1473f13a87ccfdfe2555ac9ab798fbc073805 (patch) | |
tree | 18a15afbca3cdbbf262e0737d01e23e7b4905cf1 /view/theme/redbasic/schema | |
parent | 2f73d24ab134391c3b3a69d5cbfede42e028b5ed (diff) | |
parent | f2171173fe2c9a0596672da293eb756a514ff789 (diff) | |
download | volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.gz volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.bz2 volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/theme/redbasic/schema')
-rw-r--r-- | view/theme/redbasic/schema/boxy.css | 4 | ||||
-rw-r--r-- | view/theme/redbasic/schema/boxy.php | 2 | ||||
-rw-r--r-- | view/theme/redbasic/schema/dark.css | 6 | ||||
-rw-r--r-- | view/theme/redbasic/schema/focus.css | 22 | ||||
-rw-r--r-- | view/theme/redbasic/schema/focus.php | 63 | ||||
-rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.css | 6 | ||||
-rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.css | 6 | ||||
-rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.css | 10 |
8 files changed, 28 insertions, 91 deletions
diff --git a/view/theme/redbasic/schema/boxy.css b/view/theme/redbasic/schema/boxy.css index f3da9b262..ad3e587f0 100644 --- a/view/theme/redbasic/schema/boxy.css +++ b/view/theme/redbasic/schema/boxy.css @@ -3,9 +3,9 @@ } .wall-item-content-wrapper.comment { - border-width: 0px 1px 1px 1px; + border-width: 0px 0px 1px 0px; } .hide-comments-outer { - border-width: 1px 1px 1px 1px; + border-width: 1px 0px 1px 0px; } diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php index d609ccd25..f298a0def 100644 --- a/view/theme/redbasic/schema/boxy.php +++ b/view/theme/redbasic/schema/boxy.php @@ -2,3 +2,5 @@ if (! $radiuspx) $radiuspx = "4"; +if (! $comment_border_colour) + $comment_border_colour = "rgb(238,238,238)"; diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 02ee4707e..4e8e23de5 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -1,4 +1,10 @@ +.generic-content-wrapper { + border: 1px solid #111; + background-color: transparent; +} + .vcard, #contact-block, .widget { + background-color: transparent; border-bottom: 1px solid #fff; } diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css deleted file mode 100644 index ea983ffc8..000000000 --- a/view/theme/redbasic/schema/focus.css +++ /dev/null @@ -1,22 +0,0 @@ -.generic-content-wrapper { - border: 1px solid #ccc; - box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); - border-radius: 4px; - background-color: #fff; -} - -.wall-item-content-wrapper.comment { - background-color: #fff; -} - -.section-content-tools-wrapper, -.section-content-wrapper, -.section-content-wrapper-np, -.hide-comments-outer { - background-color: #fff; -} - -.wall-item-conv { - padding-top: 10px; - padding-left: 10px; -} diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php deleted file mode 100644 index 1f1963764..000000000 --- a/view/theme/redbasic/schema/focus.php +++ /dev/null @@ -1,63 +0,0 @@ -<?php -if (! $nav_bg) - $nav_bg = "#222"; -if (! $nav_gradient_top) - $nav_gradient_top = "#3c3c3c"; -if (! $nav_gradient_bottom) - $nav_gradient_bottom = "#222"; -if (! $nav_active_gradient_top) - $nav_active_gradient_top = "#222"; -if (! $nav_active_gradient_bottom) - $nav_active_gradient_bottom = "#282828"; -if (! $nav_bd) - $nav_bd = "#222"; -if (! $nav_icon_colour) - $nav_icon_colour = "#999"; -if (! $nav_active_icon_colour) - $nav_active_icon_colour = "#fff"; -if (! $link_colour) - $link_colour = "#337AB7"; -if (! $banner_colour) - $banner_colour = "#fff"; -if (! $bgcolour) - $bgcolour = "#fdfdfd"; -if (! $background_image) - $background_image =''; -if (! $item_colour) - $item_colour = "rgb(238,238,238)"; -if (! $comment_item_colour) - $comment_item_colour = "rgba(254,254,254,0.4)"; -if (! $comment_border_colour) - $comment_border_colour = "transparent"; -if (! $toolicon_colour) - $toolicon_colour = '#777'; -if (! $toolicon_activecolour) - $toolicon_activecolour = '#000'; -if (! $item_opacity) - $item_opacity = "1"; -if (! $font_size) - $font_size = "0.9rem"; -if (! $body_font_size) - $body_font_size = "0.75rem"; -if (! $font_colour) - $font_colour = "#4d4d4d"; -if (! $radius) - $radius = "4"; -if (! $shadow) - $shadow = "0"; -if (! $converse_width) - $converse_width = "790"; -if(! $top_photo) - $top_photo = '48px'; -if(! $comment_indent) - $comment_indent = '0px'; -if(! $reply_photo) - $reply_photo = '32px'; -if($nav_min_opacity === false || $nav_min_opacity === '') { - $nav_float_min_opacity = 1.0; - $nav_percent_min_opacity = 100; -} -else { - $nav_float_min_opacity = (float) $nav_min_opacity; - $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; -} diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css index c00f3c260..f69ba3450 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.css +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -1,4 +1,10 @@ +.generic-content-wrapper { + border: 1px solid #fff; + background-color: transparent; +} + .vcard, #contact-block, .widget { + background-color: transparent; border-bottom: 1px solid #fff; } diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css index ce4465930..1f0a2f1e6 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.css +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -1,4 +1,10 @@ +.generic-content-wrapper { + border: 1px solid #000; + background-color: transparent; +} + .vcard, #contact-block, .widget { + background-color: transparent; border-bottom: 1px solid #fff; } diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css index 3504265b9..627f3ee5c 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.css +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -1,9 +1,11 @@ -.vcard, #contact-block, .widget { - border-bottom: 1px solid #fff; +.generic-content-wrapper { + border: 1px solid #000; + background-color: transparent; } -.abook-pending-contact, .abook-permschange { - background: #000; +.vcard, #contact-block, .widget { + background-color: transparent; + border-bottom: 1px solid #fff; } #cboxContent a { |