From 4e0d11ab6fb0e3e482b3b7f3877552b9ec1f42e1 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 31 Jan 2020 15:06:08 +0300
Subject: Change tags styling

---
 src/main/assets/style.css                               | 14 +++++++-------
 src/main/resources/templates/views/partial/message.html | 10 ++++++----
 src/main/resources/templates/views/thread.html          |  8 +++++---
 3 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'src/main')

diff --git a/src/main/assets/style.css b/src/main/assets/style.css
index 44f11787..6acfa0d3 100644
--- a/src/main/assets/style.css
+++ b/src/main/assets/style.css
@@ -315,12 +315,6 @@ article time {
     color: #88958d;
     font-size: 10pt;
 }
-article p {
-    clear: left;
-    margin: 5px 0 15px 0;
-    word-wrap: break-word;
-    overflow-wrap: break-word;
-}
 article .ir {
     text-align: center;
 }
@@ -357,8 +351,14 @@ article .tags {
     min-height: 1px;
 }
 article .tags > a,
-.badge,
 .msg-tags > a {
+    color: #88958d;
+}
+article .tags > a::before,
+.msg-tags > a::before{
+    content: '#';
+}
+.badge {
     background: #eee;
     border: 1px solid #eee;
     color: #88958d;
diff --git a/src/main/resources/templates/views/partial/message.html b/src/main/resources/templates/views/partial/message.html
index 9a4d6452..8b8670ce 100644
--- a/src/main/resources/templates/views/partial/message.html
+++ b/src/main/resources/templates/views/partial/message.html
@@ -17,11 +17,13 @@
             · Edited
             {% endif %}
         </div>
-        <div class="msg-tags">
-            {{ tags(msg.user.name, msg.tags | tagsList) }}
-        </div>
     </header>
-    <p>{{ msg | formatMessage }}</p>
+    <div class="msg-txt">
+        <span class="msg-tags">
+            {{ tags(msg.user.name, msg.tags | tagsList) }}
+        </span>
+        {{ msg | formatMessage }}
+    </div>
     {% if msg.AttachmentType is not empty %}
     <p class="ir"><a href="//i.juick.com/p/{{ msg.mid }}.{{ msg.AttachmentType }}" data-fname="{{ msg.mid }}.{{ msg.AttachmentType }}">
         <img src="//i.juick.com/photos-512/{{ msg.mid }}.{{ msg.AttachmentType }}" alt=""/></a>
diff --git a/src/main/resources/templates/views/thread.html b/src/main/resources/templates/views/thread.html
index 252b41b0..e09c1e60 100644
--- a/src/main/resources/templates/views/thread.html
+++ b/src/main/resources/templates/views/thread.html
@@ -22,11 +22,13 @@
                     &middot; Edited
                     {% endif %}
                 </div>
-                <div class="msg-tags">
+            </div>
+            <div class="msg-txt">
+                <span class="msg-tags">
                     {{ tags(msg.user.name, msg.tags | tagsList) }}
-                </div>
+                </span>
+                {{ msg | formatMessage }}
             </div>
-            <div class="msg-txt">{{ msg | formatMessage }}</div>
             {% if msg.AttachmentType is not empty %}
             <div class="msg-media">
                 <a href="//i.juick.com/p/{{ msg.mid }}.{{ msg.AttachmentType }}" data-fname="{{ msg.mid }}.{{ msg.AttachmentType }}">
-- 
cgit v1.2.3