Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-11 09:17:21 +00:00
parent 0c2a16fcbf b6003afcdb
commit a0724cd742
12 changed files with 133 additions and 41 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2515,6 +2515,10 @@ a.status-card {
    flex: 1;
  }

+  & > .column-header__back-button {
+    color: $ui-highlight-color;
+  }
+
  &.active {
    box-shadow: 0 1px 0 rgba($ui-highlight-color, 0.3);