tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
This commit is contained in:
David Yip
2018-04-08 19:05:02 -05:00
parent 695b53b796 0893b16695
commit 67e77f230e
61 changed files with 373 additions and 1436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/styles/mastodon/about.scss
View File

@ -322,6 +322,11 @@ $small-breakpoint: 960px;
border: 0;
border-bottom: 1px solid rgba($ui-base-lighter-color, .6);
margin: 20px 0;
&.spacer {
height: 1px;
border: 0;
}
}
.container-alt {