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

2019-11-30 17:29:44 +01:00
parent 93b8aec7b7 b532ead798
commit 2b7158427f
22 changed files with 611 additions and 494 deletions
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -646,7 +646,7 @@
        }

        .counter {
-          width: 33.3%;
+          min-width: 33.3%;
          box-sizing: border-box;
          flex: 0 0 auto;
          color: $darker-text-color;