diff options
| author | RedMatrix <info@friendica.com> | 2014-05-12 09:43:58 +1000 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2014-05-12 09:43:58 +1000 |
| commit | c455663509a094c22116be60034028378aa07100 (patch) | |
| tree | 76a6a430d8502501213c50ece2730d84189a68d5 | |
| parent | b4fd20c6240a154985ea653722e814dbfaccb85f (diff) | |
| parent | 3fbac93619a59e03706a771a1527c8492ff85e82 (diff) | |
| download | volse-hubzilla-c455663509a094c22116be60034028378aa07100.tar.gz volse-hubzilla-c455663509a094c22116be60034028378aa07100.tar.bz2 volse-hubzilla-c455663509a094c22116be60034028378aa07100.zip | |
Merge pull request #456 from cvogeley/master
Move "boxy" conversation design into a schema file
| -rw-r--r-- | view/theme/redbasic/css/style.css | 30 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 18 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/boxy.php | 19 |
3 files changed, 59 insertions, 8 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ba26f8910..88fd693ad 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1911,29 +1911,45 @@ img.mail-list-sender-photo { .wall-item-content-wrapper:hover { z-index:99; } -/* .comment .wall-item-body { -padding-left: 42px; + padding-left: $comment_padding; } - */ + .hide-comments-outer, .wall-item-content-wrapper.comment { background-color: $comment_item_colour; - border-left: 1px solid $comment_border_colour; - border-right: 1px solid $comment_border_colour; - border-bottom: 1px solid $comment_border_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-radius: 0px; padding: 7px 10px 7px 7px; } +/* +.thread-wrapper.toplevel_item{ + border-bottom: $comment_border_bottom $comment_border_colour; + border-right: $comment_border_right $item_colour; + border-left: $comment_border_left $item_colour; + + border-top-right-radius: $radiuspx; + border-top-left-radius: $radiuspx; + border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radiuspx; +} + */ .wall-item-comment-wrapper { background-color: $comment_item_colour; - border: 1px solid $item_colour; + /* border-top: $comment_border_top $item_colour; */ + border-right: $comment_border_right $item_colour; + border-left: $comment_border_left $item_colour; + border-bottom: $comment_border_bottom $item_colour; border-radius: 0px; border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; } + .wall-item-like, .wall-item-dislike { font-size: 11px; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 698adaf4d..e03d1c741 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -248,6 +248,17 @@ if(! $a->install) { $reply_photo = '32px'; if(! $infomess_bgcolour) $infomess_bgcolour = "#F0F0F0"; + if (!$comment_padding) + $comment_padding="0px"; + if (!$comment_border_left) + $comment_border_left="2px 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($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; @@ -357,7 +368,12 @@ $options = array ( '$pmenu_reply' => $pmenu_reply, '$wwtop' => $wwtop, '$comment_indent' => $comment_indent, -'$body_width' => $body_width +'$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, ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php new file mode 100644 index 000000000..1de2f98cd --- /dev/null +++ b/view/theme/redbasic/schema/boxy.php @@ -0,0 +1,19 @@ +<?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 |