aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-08 14:15:43 -0700
committerfriendica <info@friendica.com>2015-03-08 14:15:43 -0700
commitb0f8d7f0db4fff8b6853c923189cb33f8ce5b645 (patch)
treed8a5d88255e909b2c191bdf3254d26eb60009733
parentb5683bfac4fd5e0e6cc15995c5c4f574e54e33da (diff)
parent9e6d85b4ea3e04c605f71b22121053c6562a7c3e (diff)
downloadvolse-hubzilla-b0f8d7f0db4fff8b6853c923189cb33f8ce5b645.tar.gz
volse-hubzilla-b0f8d7f0db4fff8b6853c923189cb33f8ce5b645.tar.bz2
volse-hubzilla-b0f8d7f0db4fff8b6853c923189cb33f8ce5b645.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--view/theme/redbasic/css/style.css24
-rw-r--r--view/theme/redbasic/php/style.php15
-rw-r--r--view/theme/redbasic/schema/boxy.css11
-rw-r--r--view/theme/redbasic/schema/boxy.php15
4 files changed, 24 insertions, 41 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 69a78f610..576eba5f6 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1688,25 +1688,22 @@ img.mail-list-sender-photo {
border-radius: $radiuspx;
}
-.comment .wall-item-body {
- padding-left: $comment_padding;
-}
-
.wall-item-content-wrapper.comment {
background-color: $comment_item_colour;
- border-left: $comment_border_left $comment_border_colour;
- border-right: $comment_border_right $comment_border_colour;
- border-bottom: $comment_border_bottom $comment_border_colour;
+ border-color: $comment_border_colour;
+ border-style: solid;
+ border-width: 0px 0px 0px 3px;
border-radius: 0px;
padding: 7px 10px 7px 7px;
}
.hide-comments-outer {
background-color: $comment_item_colour;
- border-left: $comment_border_left $comment_border_colour;
- border-right: $comment_border_right $comment_border_colour;
- border-bottom: $comment_border_bottom $comment_border_colour;
- border-top: 1px dashed #ccc;
+ border-color: $comment_border_colour;
+ border-top-color: #ccc;
+ border-style: solid;
+ border-top-style: dashed;
+ border-width: 1px 0px 0px 3px;
text-align: center;
border-radius: 0px;
}
@@ -2300,6 +2297,10 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
display: none;
}
+.field.checkbox:hover label {
+ color: $link_colour;
+}
+
.field.checkbox > div label {
display: block; overflow: hidden; cursor: pointer;
border: 1px solid #ccc;
@@ -2322,6 +2323,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
content: attr(data-on);
padding-right: 21px;
background-color: $item_colour;
+ color: $font_colour;
text-align: right;
}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 30d5f0a16..a3234862a 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -282,16 +282,6 @@ if(! $a->install) {
$chat_txtbgcol = "#EEE";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#FFFFFF";
- if (!$comment_padding)
- $comment_padding="0px";
- if (!$comment_border_left)
- $comment_border_left="3px solid";
- if (!$comment_border_right)
- $comment_border_right="0px solid";
- if (!$comment_border_top)
- $comment_border_top="0px solid";
- if (!$comment_border_bottom)
- $comment_border_bottom="0px solid";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#BBC7D7";
if (!$dirpopup_txtcol)
@@ -352,7 +342,6 @@ $options = array (
'$selected_active_colour' => $selected_active_colour,
'$selected_active_deco' => $selected_active_deco,
'$body_font_size' => $body_font_size,
-'$widget_brdrcolour' => $widget_brdrcolour,
'$blockquote_colour' => $blockquote_colour,
'$blockquote_bgcolour' => $blockquote_bgcolour,
'$blockquote_bordercolour' => $blockquote_bordercolour,
@@ -425,10 +414,6 @@ $options = array (
'$comment_indent' => $comment_indent,
'$body_width' => $body_width,
'$comment_padding' => $comment_padding,
-'$comment_border_left' => $comment_border_left,
-'$comment_border_right' => $comment_border_right,
-'$comment_border_top' => $comment_border_top,
-'$comment_border_bottom' => $comment_border_bottom,
'$admintable_hoverbgcol' => $admintable_hoverbgcol,
'$dirpopup_txtcol' => $dirpopup_txtcol,
'$dirpopup_linkcol' => $dirpopup_linkcol,
diff --git a/view/theme/redbasic/schema/boxy.css b/view/theme/redbasic/schema/boxy.css
index e69de29bb..f3da9b262 100644
--- a/view/theme/redbasic/schema/boxy.css
+++ b/view/theme/redbasic/schema/boxy.css
@@ -0,0 +1,11 @@
+.comment .wall-item-body {
+ padding-left: 42px;
+}
+
+.wall-item-content-wrapper.comment {
+ border-width: 0px 1px 1px 1px;
+}
+
+.hide-comments-outer {
+ border-width: 1px 1px 1px 1px;
+}
diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php
index 1de2f98cd..d609ccd25 100644
--- a/view/theme/redbasic/schema/boxy.php
+++ b/view/theme/redbasic/schema/boxy.php
@@ -1,19 +1,4 @@
<?php
-if (!$comment_padding)
- $comment_padding="42px";
-
-if (!$comment_border_left)
- $comment_border_left="1px solid";
-
-if (!$comment_border_right)
- $comment_border_right="1px solid";
-
-if (!$comment_border_top)
- $comment_border_top="1px solid";
-
-if (!$comment_border_bottom)
- $comment_border_bottom="1px solid";
if (! $radiuspx)
$radiuspx = "4";
- \ No newline at end of file