]> cat aescling's git repositories - mastodon.git/commitdiff
Clean up leftover from DM conversation view redesign
authorThibaut Girka <thib@sitedethib.com>
Tue, 15 Sep 2020 15:58:05 +0000 (17:58 +0200)
committerThibG <thib@sitedethib.com>
Thu, 17 Sep 2020 13:22:56 +0000 (15:22 +0200)
app/javascript/flavours/glitch/components/status.js
app/javascript/flavours/glitch/styles/components/status.scss
app/javascript/flavours/glitch/styles/mastodon-light/diff.scss

index 4e628a420a1e7730fe58a9353be0b72ff61bbf05..fe0234d842d3467f34f261aa8952f80301c7c8b9 100644 (file)
@@ -694,7 +694,7 @@ class Status extends ImmutablePureComponent {
       collapsed: isCollapsed,
       'has-background': isCollapsed && background,
       'status__wrapper-reply': !!status.get('in_reply_to_id'),
-      read: unread === false,
+      unread,
       muted,
     }, 'focusable');
 
index a655811364adce898c8df9b9a898d8f4f31831be..f3403a2439e3eac5d259ec897f9f870f43808742 100644 (file)
     outline: 0;
     background: lighten($ui-base-color, 4%);
 
-    &.status.status-direct:not(.read) {
+    &.status.status-direct {
       background: lighten($ui-base-color, 12%);
 
       &.muted {
     margin-top: 8px;
   }
 
-  &.status-direct:not(.read) {
+  &.status-direct {
     background: lighten($ui-base-color, 8%);
     border-bottom-color: lighten($ui-base-color, 12%);
   }
     &:focus > .status__content:after {
       background: linear-gradient(rgba(lighten($ui-base-color, 4%), 0), rgba(lighten($ui-base-color, 4%), 1));
     }
-    &.status-direct:not(.read)> .status__content:after {
+    &.status-direct > .status__content:after {
       background: linear-gradient(rgba(lighten($ui-base-color, 8%), 0), rgba(lighten($ui-base-color, 8%), 1));
     }
 
index c83c827660baa3df575c7c76d01a7af47a2f64d1..e5a5cc246b7a24d3328703a4d589dc03a09d2ed7 100644 (file)
@@ -27,7 +27,7 @@
   }
 }
 
-.status.status-direct:not(.read) {
+.status.status-direct {
   background: darken($ui-base-color, 8%);
   border-bottom-color: darken($ui-base-color, 12%);
 
@@ -36,7 +36,7 @@
   }
 }
 
-.focusable:focus.status.status-direct:not(.read) {
+.focusable:focus.status.status-direct {
   background: darken($ui-base-color, 4%);
 
   &.collapsed> .status__content:after {