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

2019-03-30 12:36:24 +01:00
parent b6fa500806 51625d3423
commit 4444d8f9b3
29 changed files with 454 additions and 182 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5308,6 +5308,7 @@ noscript {
      margin-left: -2px;

      .account__avatar {
+        background: darken($ui-base-color, 8%);
        border: 2px solid lighten($ui-base-color, 4%);
      }
    }
--- a/app/javascript/styles/mastodon/stream_entries.scss
+++ b/app/javascript/styles/mastodon/stream_entries.scss
@@ -99,9 +99,9 @@
    }
  }

-  &:active,
-  &:focus,
-  &:hover {
+  &:active:not(:disabled),
+  &:focus:not(:disabled),
+  &:hover:not(:disabled) {
    background: lighten($ui-highlight-color, 10%);

    svg path:last-child {
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -352,6 +352,7 @@
    border-radius: 50%;
    position: relative;
    margin-left: -10px;
+    background: darken($ui-base-color, 8%);
    border: 2px solid $ui-base-color;

    &:nth-child(1) {