From f4e85c571ae92cef7c8cd47f0ee7467bf35d67a2 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Sun, 25 Oct 2020 11:36:00 +0000
Subject: Fix CSS issues

---
 templates/notification.tmpl | 23 ++++++++++-------------
 templates/status.tmpl       |  3 ++-
 templates/userlist.tmpl     |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'templates')

diff --git a/templates/notification.tmpl b/templates/notification.tmpl
index 059268a..10eaafc 100644
--- a/templates/notification.tmpl
+++ b/templates/notification.tmpl
@@ -1,15 +1,15 @@
 {{with .Data}}
 {{template "header.tmpl" (WithContext .CommonData $.Ctx)}}
 <div class="notification-title-container">
-	<div class="notification-title">
+	<span class="page-title">
 		Notifications
 		{{if and (not $.Ctx.AntiDopamineMode) (gt .UnreadCount 0)}}
 			({{.UnreadCount }})
 		{{end}}
-	</div>
+	</span>
 	<a class="notification-refresh" href="/notifications" target="_self" accesskey="R" title="Refresh (R)">refresh</a>
 	{{if .ReadID}}
-	<form action="/notifications/read?max_id={{.ReadID}}" method="post" target="_self">
+	<form class="notification-read" action="/notifications/read?max_id={{.ReadID}}" method="post" target="_self">
 		<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
 		<input type="submit" value="read" class="btn-link" accesskey="C" title="Clear unread notifications (C)">
 	</form>
@@ -17,7 +17,7 @@
 </div>
 
 {{range .Notifications}}
-<div class="notification-container {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}">
+<div class="status-container-container {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}">
 	{{if eq .Type "follow"}}
 	<div class="notification-follow-container">
 		<div class="status-profile-img-container">
@@ -28,9 +28,8 @@
 		<div class="notification-follow">
 			<div class="notification-info-text">
 				<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-				<span> followed you </span>
-				<span>
-					- <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
+				<span class="notification-text"> followed you - 
+					<time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
 				</span>
 			</div>
 			<div>
@@ -50,9 +49,8 @@
 		<a href="/user/{{.Account.ID}}">
 			<span class="status-uname"> @{{.Account.Acct}} </span>
 		</a>
-		<span> retweeted your post </span>
-		<span>
-			- <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
+		<span class="notification-text"> retweeted your post - 
+			<time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
 		</span>
 	</div>
 	{{template "status" (WithContext .Status $.Ctx)}}
@@ -65,9 +63,8 @@
 		<a href="/user/{{.Account.ID}}">
 			<span class="status-uname"> @{{.Account.Acct}} </span>
 		</a>
-		<span> liked your post </span>
-		<span>
-			- <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
+		<span class="notification-text"> liked your post - 
+			<time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
 		</span>
 	</div>
 	{{template "status" (WithContext .Status $.Ctx)}}
diff --git a/templates/status.tmpl b/templates/status.tmpl
index 438f023..432c9a6 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -89,6 +89,7 @@
 			{{if .Content}}
 			<div class="status-content"> {{StatusContentFilter .SpoilerText .Content .Emojis .Mentions}} </div>
 			{{end}}
+			{{if .MediaAttachments}}
 			<div class="status-media-container">
 				{{range .MediaAttachments}}
 
@@ -132,9 +133,9 @@
 				{{else}}
 				<a href="{{.URL}}" target="_blank" title="{{.Description}}"> [attachment] </a>
 				{{end}}
-
 				{{end}}
 			</div>
+			{{end}}
 			{{if .Poll}}
 			<form class="poll-form" action="/vote/{{.Poll.ID}}" method="POST" target="_self">
 				<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
diff --git a/templates/userlist.tmpl b/templates/userlist.tmpl
index ec8884d..0a83bf4 100644
--- a/templates/userlist.tmpl
+++ b/templates/userlist.tmpl
@@ -1,5 +1,5 @@
 {{with .Data}}
-<div class="user-list-container">
+<div>
 	{{range .}}
 	<div class="user-list-item">
 		<div class="user-list-profile-img">
-- 
cgit v1.2.3