diff options
-rw-r--r-- | src/main/assets/style.css | 30 | ||||
-rw-r--r-- | src/main/resources/templates/views/thread.html | 17 |
2 files changed, 19 insertions, 28 deletions
diff --git a/src/main/assets/style.css b/src/main/assets/style.css index 99cefffa..00f92ef3 100644 --- a/src/main/assets/style.css +++ b/src/main/assets/style.css @@ -392,12 +392,12 @@ article .ir a { display: block; } -article .ir img { +article .ir img, .msg-media img { max-width: 100%; } article > nav.l, .msg-cont > nav.l { - border-top: 1px solid var(--border-color); + border-bottom: 1px solid var(--border-color); display: flex; align-items: center; justify-content: space-around; @@ -490,8 +490,16 @@ article .tags > a::before, .msg-cont { background: var(--text-background-color); border: 1px solid var(--border-color); + border-bottom: 1px solid transparent; line-height: 140%; - margin-bottom: 12px; +} + +#replies .msg-cont { + border-top: 1px solid transparent; +} + +#replies .msg-cont:last-child { + border-bottom: 1px solid var(--border-color); } .reply-new .msg-cont { @@ -580,22 +588,6 @@ article .tags > a::before, margin: 0; } -.title2 { - background: var(--text-background-color); - margin: 20px 0; - padding: 10px 20px; -} - -.title2-right { - float: right; - line-height: 24px; -} - -#content .title2 h2 { - font-size: x-large; - margin: 0; -} - /* #endregion */ /* #region user-generated texts */ diff --git a/src/main/resources/templates/views/thread.html b/src/main/resources/templates/views/thread.html index ab751294..bb497730 100644 --- a/src/main/resources/templates/views/thread.html +++ b/src/main/resources/templates/views/thread.html @@ -6,7 +6,7 @@ <div class="msg-cont"> <div class="msg-header"> <div class="msg-avatar"> - <a href="/{{ msg.user.name }}/"><img src="{{ msg.user.avatar }}" alt="{{ msg.user.name }}"/></a> + <a href="/{{ msg.user.name }}/"><img src="{{ msg.user.avatar }}" alt="{{ msg.user.name }}"></a> </div> <span> <a href="/{{ msg.user.name }}/"><span>{{ msg.user.name }}</span>{% if msg.user.premium %}<span style="color: green;"><i data-icon="ei-star" data-size="s"></i></span>{% endif %}</a> @@ -35,7 +35,7 @@ {% 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 }}"> - <img src="//i.juick.com/photos-512/{{ msg.mid }}.{{ msg.AttachmentType }}" alt=""/> + <img src="//i.juick.com/photos-512/{{ msg.mid }}.{{ msg.AttachmentType }}" alt=""> </a> </div> {% endif %} @@ -102,7 +102,7 @@ </nav> {% if msg.VisitorCanComment %} <form class="msg-comment-target"> - <input type="hidden" name="mid" value="{{ msg.mid }}"/> + <input type="hidden" name="mid" value="{{ msg.mid }}"> <div class="msg-comment"> <div class="ta-wrapper"> <textarea name="body" rows="1" class="reply" placeholder="{{ i18n("messages","message.writeComment") }}"></textarea> @@ -124,11 +124,10 @@ </div> </li> </ul> -<div class="title2"> +<div style="display:none;"> {% if visitor.uid > 0 %} - <img src="/api/thread/mark_read/{{ msg.mid }}-{{ msg.rid }}.gif?hash={{visitor.authHash}}" /> + <img src="/api/thread/mark_read/{{ msg.mid }}-{{ msg.rid }}.gif"> {% endif %} - <h2>{{ i18n("messages","reply.replies") }} ({{ replies.size() }})</h2> </div> <ul id="replies"> @@ -140,13 +139,13 @@ <a class="a-username" href="/{{ msg.user.name }}/">{{ msg.user.name }}{% if msg.user.premium %}<span style="color: green;"><i data-icon="ei-star" data-size="s"></i></span>{% endif %}</a> <div class="msg-avatar"> <a class="a-username" href="/{{ msg.user.name }}/"> - <img src="{{ msg.user.avatar }}" alt="{{ msg.user.name }}"/> + <img src="{{ msg.user.avatar }}" alt="{{ msg.user.name }}"> </a> </div> {% else %} [удалено]: <div class="msg-avatar"> - <img src="//i.juick.com/av-96.png"/> + <img src="//i.juick.com/av-96.png"> </div> {% endif %} <div class="msg-ts"> @@ -165,7 +164,7 @@ {% if msg.AttachmentType is not empty %} <div class="msg-media"> <a href="//i.juick.com/p/{{ msg.mid }}-{{ msg.rid }}.{{ msg.AttachmentType }}" data-fname="{{ msg.mid }}-{{ msg.rid }}.{{ msg.AttachmentType }}"> - <img src="//i.juick.com/photos-512/{{ msg.mid }}-{{ msg.rid }}.{{ msg.AttachmentType }}" alt=""/> + <img src="//i.juick.com/photos-512/{{ msg.mid }}-{{ msg.rid }}.{{ msg.AttachmentType }}" alt=""> </a> </div> {% endif %} |