Merge commit 'e8bfd3093b0bf16c2ce56b3905ea640aa26d0127'
authorPete <pete@debu.gs>
Sun, 17 Jan 2021 10:29:47 +0000 (02:29 -0800)
committerPete <pete@debu.gs>
Sun, 17 Jan 2021 10:29:47 +0000 (02:29 -0800)
1  2 
service/service.go
static/style.css
templates/notification.tmpl
templates/status.tmpl
templates/user.tmpl

Simple merge
index b2f2a0956e62171a233c4deee7720344d79991f5,5002fd6c75416adc477bb8856dd129eff22e4251..a914d260ee1bd1fe9af0586263f6860e207f0b59
        font-size: 13pt;
  }
  
 -.notification-container {
++
 +.notification-container .retweet-info {
 +      opacity: 0.8;
 +}
 +
- .notification-container {
-       margin: 16px 0 16px -4px;
-       padding: 0 4px;
+       margin: 0 -4px 12px -4px;
+       padding: 4px;
        border-left: 4px solid transparent;
  }
  
        border-color: #777777;
  }
  
- .notification-container.favourite .status-container, .notification-container.reblog .status-container {
-       opacity: 0.5;
+ .notification-container.favourite .status-container,
+ .notification-container.reblog .status-container {
+       opacity: 0.6;
 +      font-size: 0.75em;
 +}
 +
 +.notification-follow-container {
 +      display: flex;
  }
  
  .notification-info-text span {
Simple merge
Simple merge
Simple merge