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

2018-11-09 14:56:31 +01:00
parent a2a254625b ed7c5f94f7
commit 9201398507
26 changed files with 191 additions and 97 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1847,7 +1847,7 @@ a.account__display-name {
 }

 .column {
-  width: 330px;
+  width: 350px;
  position: relative;
  box-sizing: border-box;
  display: flex;
@@ -2092,6 +2092,16 @@ a.account__display-name {
  @supports(display: grid) { // hack to fix Chrome <57
    contain: strict;
  }
+
+  &--flex {
+    display: flex;
+    flex-direction: column;
+  }
+
+  &__append {
+    flex: 1 1 auto;
+    position: relative;
+  }
 }

 .scrollable.fullscreen {