Fix merge. ...Again.
authorPete <pete@debu.gs>
Sun, 17 Jan 2021 10:40:58 +0000 (02:40 -0800)
committerPete <pete@debu.gs>
Sun, 17 Jan 2021 10:40:58 +0000 (02:40 -0800)
static/style.css
templates/notification.tmpl

index 618e5c8ab564926c6e629e9c383d4ba4364e53b5..3992e14446cbb95d39809a80e6205ebf15a32dcf 100644 (file)
@@ -183,6 +183,7 @@ body {
        opacity: 0.8;
 }
 
+.notification-container {
        margin: 0 -4px 12px -4px;
        padding: 4px;
        border-left: 4px solid transparent;
index 91d31fd7c5f86d975e353779721d653a45267e53..b5976f9232d45edd456e1b5627843dd710e9569b 100644 (file)
@@ -18,7 +18,7 @@
 </div>
 
 {{range .Notifications}}
-<div class="status-container-container {{.Type}} {{(StatusColor .Account.Acct)}} {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}">
+<div class="notification-container {{.Type}} {{(StatusColor .Account.Acct)}} {{if .Pleroma}}{{if not .Pleroma.IsSeen}}unread{{end}}{{end}}">
        {{if eq .Type "follow"}}
        <div class="notification-follow-container">
                <div class="status-profile-img-container">