David Yip f61aa8e0f7 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb		2018-03-27 10:26:47 -05:00
..
_mixins.scss
about.scss	Improve styling of closed registrations message, rename button (#6695)	2018-03-08 11:10:37 +01: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
compact_header.scss
components.scss	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-27 10:26:47 -05:00
containers.scss	Show media modal on public pages (#6801)	2018-03-24 12:52:26 +01:00
emoji_picker.scss
footer.scss
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
modal.scss	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-19 15:22:10 -06:00
reset.scss
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