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

2018-01-03 04:17:11 +00:00
parent fa768abf5c 99f962ba73
commit 933840bebf
46 changed files with 1482 additions and 52 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2072,6 +2072,11 @@
  cursor: default;
 }

+.getting-started__wrapper,
+.getting_started {
+  background: $ui-base-color;
+}
+
 .getting-started__wrapper {
  position: relative;
  overflow-y: auto;