From 6332a50466536c17f4a61e7ae47a2cb21e407e15 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 15 Jul 2019 22:46:22 -0400 Subject: [PATCH] [frio] Remove outer post padding - Include mobile view changes - Includes search view changes --- view/theme/frio/css/style.css | 30 +++++++++----- view/theme/frio/js/theme.js | 2 +- view/theme/frio/templates/wall_thread.tpl | 49 +++++++++-------------- 3 files changed, 39 insertions(+), 42 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 2a5706c859..a88276f15d 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1621,8 +1621,6 @@ textarea#profile-jot-text:focus + #preview_profile-jot-text { padding: 15px; } .panel .panel-body { - padding: 15px; - font-size: 14px; word-wrap: break-word; } .panel .panel-body .wall-item-content { @@ -1668,13 +1666,19 @@ aside .panel-body { /* wall items */ .wall-item-container { - background-color: rgba(0, 0, 0, 0.03); - padding: 0.5em; border-top: 1px solid rgba(255, 255, 255, 0.8); } +.wall-item-container.panel-body { + padding: 0; + border-top: none; + overflow: hidden; +} + .wall-item-container .media { margin-top: 0; + padding: 10px; + background-color: rgba(0, 0, 0, 0.03); } /* wall items contact photo */ @@ -1738,8 +1742,8 @@ aside .panel-body { top: 10px; } .comment .nav-pills.preferences { - right: 0px; - top: 0px; + right: 5px; + top: 5px; } .wall-item-network { font-size: 13px; @@ -1897,7 +1901,7 @@ code > .hl-main { } .wall-item-tags, .itemedited { - margin-top: 10px; + margin: 10px 0; font-size: 13px; } @@ -1920,7 +1924,7 @@ code > .hl-main { /* item social action buttons */ .wall-item-actions { display: flex; - margin: .5em 0; + margin: 0; justify-content: space-between; } .wall-item-actions a, .wall-item-actions button { @@ -1961,6 +1965,10 @@ code > .hl-main { margin: 0 .3em; } +.wall-item-responses > div > p { + margin: 0; +} + /* wall item hover effects */ .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions, @@ -2008,7 +2016,6 @@ code > .hl-main { margin-bottom: 0; } .comment-container { - margin-top: 10px; margin-bottom: 0px; border-top-left-radius: 3px; border-top-right-radius: 3px; @@ -2125,7 +2132,6 @@ img.acpopup-img { .wall-item-container.thread_level_6, .wall-item-container.thread_level_7 { margin-left: 15px; - margin-right: -0.5em; } /* Menubar Tabs */ section > .tabbar-wrapper { @@ -3531,6 +3537,10 @@ section .profile-match-wrapper { padding: 10px; } + .toplevel_item > .wall-item-container { + padding: 0; + } + .wall-spacer { height: 0px; } diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index 594fa25634..19b5c4fa6e 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -711,7 +711,7 @@ function scrollToItem(elementId) { return; } - var $el = $(document.getElementById(elementId)); + var $el = $('#' + elementId + ' > .media'); // Test if the Item exists if (!$el.length) { return; diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index bd069f5cd7..21923737c0 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -70,9 +70,9 @@ as the value of $top_child_total (this is done at the end of this file) {{* Use a different div container in dependence max thread-level = 7 *}} {{if $item.thread_level<7}} -
+
{{else}} -
+
{{/if}} {{if $item.thread_level==1}} @@ -80,7 +80,7 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}} -
+
{{* Put addional actions in a top-right dropdown menu *}}
+ {{foreach $item.children as $child}} + {{include file="{{$item.template}}" item=$child}} + {{/foreach}} + + {{* Insert the comment box of the top level post at the bottom of the thread. + Display this comment box if there are any comments. If not hide it. In this + case it could be opend with the "comment" button *}} + {{if $item.comment && $item.thread_level==1}} + {{if $item.total_comments_num}} +
+ +
{{/if}} -
+ + {{/if}}
{{if $mode == display}} -- 2.39.5