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

2018-12-19 12:58:49 +01:00
parent 655da1be20 af56efdec5
commit add74816a5
12 changed files with 343 additions and 22 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4806,10 +4806,12 @@ a.status-card.compact:hover {
  border-bottom: 1px solid lighten($ui-base-color, 8%);
  cursor: default;
  display: flex;
+  flex-shrink: 0;

  button {
    background: darken($ui-base-color, 4%);
    border: 0;
+    margin: 0;
  }

  button,