harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2015-03-08 14:15:43 -07:00
commit b0f8d7f0db
4 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
view/theme/redbasic/css/style.css
View File

@ -1688,25 +1688,22 @@ img.mail-list-sender-photo {
border-radius: $radiuspx; border-radius: $radiuspx;
} }
.comment .wall-item-body {
padding-left: $comment_padding;
}
.wall-item-content-wrapper.comment { .wall-item-content-wrapper.comment {
background-color: $comment_item_colour; background-color: $comment_item_colour;
border-left: $comment_border_left $comment_border_colour; border-color: $comment_border_colour;
border-right: $comment_border_right $comment_border_colour; border-style: solid;
border-bottom: $comment_border_bottom $comment_border_colour; border-width: 0px 0px 0px 3px;
border-radius: 0px; border-radius: 0px;
padding: 7px 10px 7px 7px; padding: 7px 10px 7px 7px;
} }
.hide-comments-outer { .hide-comments-outer {
background-color: $comment_item_colour; background-color: $comment_item_colour;
border-left: $comment_border_left $comment_border_colour; border-color: $comment_border_colour;
border-right: $comment_border_right $comment_border_colour; border-top-color: #ccc;
border-bottom: $comment_border_bottom $comment_border_colour; border-style: solid;
border-top: 1px dashed #ccc; border-top-style: dashed;
border-width: 1px 0px 0px 3px;
text-align: center; text-align: center;
border-radius: 0px; border-radius: 0px;
} }
@ -2300,6 +2297,10 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
display: none; display: none;
} }
.field.checkbox:hover label {
color: $link_colour;
}
.field.checkbox > div label { .field.checkbox > div label {
display: block; overflow: hidden; cursor: pointer; display: block; overflow: hidden; cursor: pointer;
border: 1px solid #ccc; border: 1px solid #ccc;
@ -2322,6 +2323,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
content: attr(data-on); content: attr(data-on);
padding-right: 21px; padding-right: 21px;
background-color: $item_colour; background-color: $item_colour;
color: $font_colour;
text-align: right; text-align: right;
} }

15
view/theme/redbasic/php/style.php
View File

@ -282,16 +282,6 @@ if(! $a->install) {
$chat_txtbgcol = "#EEE"; $chat_txtbgcol = "#EEE";
if(! $fancybox_bgcolour) if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#FFFFFF"; $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) if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#BBC7D7"; $admintable_hoverbgcol="#BBC7D7";
if (!$dirpopup_txtcol) if (!$dirpopup_txtcol)
@ -352,7 +342,6 @@ $options = array (
'$selected_active_colour' => $selected_active_colour, '$selected_active_colour' => $selected_active_colour,
'$selected_active_deco' => $selected_active_deco, '$selected_active_deco' => $selected_active_deco,
'$body_font_size' => $body_font_size, '$body_font_size' => $body_font_size,
'$widget_brdrcolour' => $widget_brdrcolour,
'$blockquote_colour' => $blockquote_colour, '$blockquote_colour' => $blockquote_colour,
'$blockquote_bgcolour' => $blockquote_bgcolour, '$blockquote_bgcolour' => $blockquote_bgcolour,
'$blockquote_bordercolour' => $blockquote_bordercolour, '$blockquote_bordercolour' => $blockquote_bordercolour,
@ -425,10 +414,6 @@ $options = array (
'$comment_indent' => $comment_indent, '$comment_indent' => $comment_indent,
'$body_width' => $body_width, '$body_width' => $body_width,
'$comment_padding' => $comment_padding, '$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, '$admintable_hoverbgcol' => $admintable_hoverbgcol,
'$dirpopup_txtcol' => $dirpopup_txtcol, '$dirpopup_txtcol' => $dirpopup_txtcol,
'$dirpopup_linkcol' => $dirpopup_linkcol, '$dirpopup_linkcol' => $dirpopup_linkcol,

11
view/theme/redbasic/schema/boxy.css
View File

@ -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;
}

15
view/theme/redbasic/schema/boxy.php
View File

@ -1,19 +1,4 @@
<?php <?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) if (! $radiuspx)
$radiuspx = "4"; $radiuspx = "4";