From c963aa98e8fdadb42c9a24889578c6c8e6f3db27 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 11 Oct 2015 22:32:06 +0200 Subject: some conv-item restructuring to allow full width elements --- view/css/conversation.css | 14 --------- view/theme/redbasic/css/style.css | 35 ++++++++++++----------- view/theme/redbasic/tpl/theme_settings.tpl | 4 +-- view/tpl/conv_item.tpl | 46 ++++++++++++++++-------------- view/tpl/conv_list.tpl | 46 ++++++++++++++++-------------- 5 files changed, 71 insertions(+), 74 deletions(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index e409cf4cf..9b659ea9f 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -83,15 +83,6 @@ code { margin-right: 10px; } -.wall-item-photo-wrapper { - margin-top: 0px; - margin-bottom: 20px; -} - -.comment .wall-item-photo-wrapper { - margin-bottom: 15px; -} - .wall-item-wrapper { margin-left:10px; } @@ -171,11 +162,6 @@ a.wall-item-name-link { margin-top: 10px; } -.wall-item-tools { - width: 100%; - margin-top: 10px; -} - .item-tool { cursor: pointer; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b51fea6cf..59b928ee9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -129,7 +129,7 @@ pre code { code { font-size: 1em; - padding: 5px; + padding: 1em; border: 1px solid #ccc; background: #ccc; color: #000; @@ -1432,7 +1432,10 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { .profile-match-connect { margin-top: 5px; } .reshared-content { margin-left: 20px; } -.shared_header img { margin-right: 10px; } +.shared_header img { + border-radius: $radiuspx; + margin-right: 10px; +} .tag1 { font-size : 0.9em !important; @@ -1635,39 +1638,39 @@ img.mail-conv-sender-photo { /* conversation */ -.wall-item-title { - font-size: $font_size; +.wall-item-head { + padding: 10px 10px 0px 10px; } -.hide-comments-outer, -.thread-wrapper .wall-item-comment-wrapper, -.wall-item-content-wrapper.comment { - margin-left: $comment_indent; +.wall-item-content { + padding: 1em 10px; +} + +.wall-item-tools { + padding: 0px 10px 10px 10px; +} + + +.wall-item-title { + font-size: $font_size; } .wall-item-content-wrapper { background-color: $item_colour; - padding: 10px; border-top-right-radius: $radiuspx; border-top-left-radius: $radiuspx; } .wall-item-content-wrapper.comment { background-color: $comment_item_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-color: $comment_border_colour; border-top-color: #ccc; border-style: solid; border-top-style: dashed; - border-width: 1px 0px 0px 3px; + border-width: 1px 0px 0px 0px; text-align: center; border-radius: 0px; } diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 4f5b69beb..cdc9de489 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -16,8 +16,8 @@ {{include file="field_colorinput.tpl" field=$background_image}} {{include file="field_colorinput.tpl" field=$item_colour}} {{include file="field_colorinput.tpl" field=$comment_item_colour}} - {{include file="field_colorinput.tpl" field=$comment_border_colour}} - {{include file="field_input.tpl" field=$comment_indent}} + {{*include file="field_colorinput.tpl" field=$comment_border_colour*}} + {{*include file="field_input.tpl" field=$comment_indent*}} {{include file="field_input.tpl" field=$body_font_size}} {{include file="field_input.tpl" field=$font_size}} {{include file="field_colorinput.tpl" field=$font_colour}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index dc8064f1a..a9661d9b5 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -8,30 +8,32 @@
-
-
- {{$item.name}} +
+
+
+ {{$item.name}} +
+
-
-
- {{if $item.title}} -
-

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

-
- {{/if}} - {{if $item.lock}} -
-   -
- {{/if}} -
- {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}} -
-
- {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.title}} +
+

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

+
+ {{/if}} + {{if $item.lock}} +
+   +
+ {{/if}} +
+ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}} +
+
+ {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} +
+
-
{{$item.body}} {{if $item.tags}} @@ -52,6 +54,7 @@
{{/if}}
+
@@ -167,6 +170,7 @@ {{/foreach}}
{{/if}} +
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 5487d5937..b10f50c13 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -8,30 +8,32 @@
-
-
- {{$item.name}} +
+
+
+ {{$item.name}} +
+
-
-
- {{if $item.title}} -
-

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

-
- {{/if}} - {{if $item.lock}} -
-   -
- {{/if}} -
- {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}} -
-
- {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.title}} +
+

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

+
+ {{/if}} + {{if $item.lock}} +
+   +
+ {{/if}} +
+ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}} +
+
+ {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} +
+
-
{{$item.body}} {{if $item.tags}} @@ -52,6 +54,7 @@
{{/if}}
+
@@ -176,6 +179,7 @@ {{/foreach}} {{/if}}
+
-- cgit v1.2.3