diff options
-rw-r--r-- | view/css/conversation.css | 4 | ||||
-rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
-rw-r--r-- | view/theme/redbasic/schema/focus.css | 5 | ||||
-rwxr-xr-x | view/tpl/conv_item.tpl | 3 | ||||
-rwxr-xr-x | view/tpl/conv_list.tpl | 3 | ||||
-rwxr-xr-x | view/tpl/photo_item.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/search_item.tpl | 2 |
7 files changed, 8 insertions, 15 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index bb6887d59..7d4930aac 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -196,10 +196,6 @@ a.wall-item-name-link { filter:alpha(opacity=100); } -.wall-item-wrapper-end { - clear: both; -} - .shared_header { margin-bottom: 20px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 089ce20d8..716298845 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -741,8 +741,8 @@ a.rateme, div.rateme { } .wall-item-conv { - margin-top: 5px; - margin-bottom: 25px; + padding-top: 5px; + padding-bottom: 10px; } diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css index 8d945a83e..3d64b8a7d 100644 --- a/view/theme/redbasic/schema/focus.css +++ b/view/theme/redbasic/schema/focus.css @@ -21,7 +21,6 @@ } .wall-item-conv { - margin-bottom: 10px; - margin-top: 10px; - margin-left: 10px; + padding-top: 10px; + padding-left: 10px; } diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 27632d770..30a007bd6 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -165,8 +165,7 @@ </div> <div class="clear"></div> </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> {{if $item.toplevel}} {{foreach $item.children as $child}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index cb2fb8959..5487d5937 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -179,8 +179,7 @@ </div> <div class="clear"></div> </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> {{if $item.comment_lastcollapsed}} diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index 16f9a76c2..2ea7aa9f3 100755 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -21,7 +21,7 @@ {{$comment}} - <div class="wall-item-outside-wrapper-end{{$indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index dee33f1b3..256443b84 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -57,7 +57,7 @@ <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a> </div> {{/if}} - <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> |