From 2f4cac371521094e61dd99067b9ed2329cc9f8d9 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 31 Jan 2020 16:06:20 +0300 Subject: Action panel styling --- src/main/assets/style.css | 8 ++------ .../resources/templates/views/partial/message.html | 22 ++++++++++++---------- src/main/resources/templates/views/thread.html | 10 +++------- 3 files changed, 17 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/main/assets/style.css b/src/main/assets/style.css index 6acfa0d3..196f2191 100644 --- a/src/main/assets/style.css +++ b/src/main/assets/style.css @@ -329,6 +329,7 @@ article > nav.l, .msg-cont > nav.l { border-top: 1px solid #eee; display: flex; + align-items: center; justify-content: space-around; font-size: 10pt; } @@ -355,7 +356,7 @@ article .tags > a, color: #88958d; } article .tags > a::before, -.msg-tags > a::before{ +.msg-tags > a::before { content: '#'; } .badge { @@ -369,11 +370,6 @@ article .tags > a::before, padding: 0 10px; } .l .msg-button { - align-items: center; - display: flex; - flex-basis: 0; - flex-direction: column; - flex-grow: 1; padding-top: 12px; } .l .msg-button-icon { diff --git a/src/main/resources/templates/views/partial/message.html b/src/main/resources/templates/views/partial/message.html index 8b8670ce..132d1ea2 100644 --- a/src/main/resources/templates/views/partial/message.html +++ b/src/main/resources/templates/views/partial/message.html @@ -7,6 +7,9 @@ {{ msg.user.name }}
+ {% if msg.FriendsOnly %} + · + {% endif %} - {% if msg.likes > 0 %} {{ msg.likes }}{% endif %} + {% if msg.likes > 0 %} + {{ msg.likes }} + {% else %} +  {{ i18n("messages","message.recommend") }} + {% endif %} -  {{ i18n("messages","message.recommend") }} + {% endif %} {% if (not msg.ReadOnly) or (visitor.uid == msg.user.uid) %} @@ -65,17 +72,12 @@ {% else %} {{ msg.Replies }} {% endif %} + {% else %} +  {{ i18n("messages","message.comment") }} {% endif %} -  {{ i18n("messages","message.comment") }} - - - -  {{ i18n("messages","message.share") }} + {% endif %} - {% if msg.FriendsOnly %} - Открыть доступ - {% endif %} \ No newline at end of file diff --git a/src/main/resources/templates/views/thread.html b/src/main/resources/templates/views/thread.html index e09c1e60..9337a87c 100644 --- a/src/main/resources/templates/views/thread.html +++ b/src/main/resources/templates/views/thread.html @@ -12,6 +12,9 @@ {{ msg.user.name }}
+ {% if msg.FriendsOnly %} + · + {% endif %} {% endif %} - - -  {{ i18n("messages","message.share") }} - {% if visitor.uid > 0 %} {% if visitor.uid != msg.user.uid %} {% if visitorSubscribed %} @@ -87,9 +86,6 @@ {% endif %} {% endif %} - {% if msg.FriendsOnly %} - Открыть доступ - {% endif %} {% if msg.VisitorCanComment %}
-- cgit v1.2.3