Merge branch 'master' into glitch-soc/merge-upstream

2019-12-01 12:12:42 +01:00
parent 7f6315841c d70268f099
commit 99f1f48741
15 changed files with 116 additions and 20 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6517,6 +6517,16 @@ noscript {
    flex: 0 0 auto;
    padding: 10px;
    padding-top: 12px;
+    position: relative;
+  }
+
+  &__unread {
+    display: inline-block;
+    background: $highlight-text-color;
+    border-radius: 50%;
+    width: 0.625rem;
+    height: 0.625rem;
+    margin: -.1ex .15em .1ex;
  }

  &__content {
@@ -6564,4 +6574,20 @@ noscript {
      word-break: break-word;
    }
  }
+
+  &--unread {
+    background: lighten($ui-base-color, 2%);
+
+    &:focus {
+      background: lighten($ui-base-color, 4%);
+    }
+
+    .conversation__content__info {
+      font-weight: 700;
+    }
+
+    .conversation__content__relative-time {
+      color: $primary-text-color;
+    }
+  }
 }