David Yip 67e77f230e Merge remote-tracking branch 'origin/master' into gs-master ... 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.		2018-04-08 19:05:02 -05:00
..
_mixins.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
about.scss	Adjust privacy policy (#6666)	2018-04-04 21:47:39 +02:00
accounts.scss	Properly center .nothing-here (#6787) (#6788)	2018-03-17 12:35:35 +01:00
admin.scss	Add headings to the security settings page (#6661)	2018-03-07 01:39:40 +01:00
basics.scss	Remove outline from body window (Fixes #6501) (#6502)	2018-02-18 16:32:58 +01:00
boost.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
compact_header.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
components.scss	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-04 13:56:58 -05:00
containers.scss	Show media modal on public pages (#6801)	2018-03-24 12:52:26 +01:00
emoji_picker.scss	Fix emoji picker scrollbar (regression from #5046) (#5901)	2017-12-06 12:18:27 +01:00
footer.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
forms.scss	Add headings to the security settings page (#6661)	2018-03-07 01:39:40 +01:00
landing_strip.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	2017-12-07 16:01:52 +01:00
lists.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
modal.scss	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-19 15:22:10 -06:00
reset.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
rtl.scss	Fix #6757: Adjust RTL styles for landing page (#6768)	2018-03-13 08:14:08 +01:00
stream_entries.scss	Fix media spoiler design (#6507)	2018-02-19 02:39:18 +01:00
tables.scss	Fix font-weight of <strong> element for CJK fonts (#5914)	2017-12-07 16:01:52 +01:00
variables.scss	Refactor scss (#6913)	2018-03-26 13:59:21 +02:00