Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		2019-05-26 15:41:40 +02:00
..
_mixins.scss	Fix hashtags select styling in default and high contrast themes (#10029)	2019-02-13 18:34:58 +01:00
about.scss	Reduce padding around logo on landing page (#10291)	2019-03-19 23:47:10 +01:00
accessibility.scss	Add a few black emojis that are to have a white outline (#8597)	2018-09-10 18:26:47 +02:00
accounts.scss	Add "why do you want to join" field to invite requests (#10524)	2019-04-09 23:06:30 +09:00
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 19:15:50 +02:00
basics.scss	Change error graphic to hover-to-play (#10055)	2019-02-15 23:33:25 +01:00
boost.scss	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
compact_header.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-26 15:41:40 +02:00
containers.scss	squashed identity proof updates (#10375)	2019-03-28 18:01:09 +01:00
dashboard.scss	Redesign admin instances area (#9645)	2019-01-08 13:39:49 +01:00
emoji_picker.scss	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)	2019-03-30 01:41:35 +01:00
footer.scss	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
forms.scss	Provide a link to existing domain block when trying to block an already-blocked domain (#10663)	2019-05-03 20:36:36 +02:00
introduction.scss	Add new first-time tutorial (#9531)	2018-12-17 11:07:17 +01:00
lists.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
modal.scss	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
polls.scss	Add emoji suggestions to CW and poll option fields (#10555)	2019-05-09 22:10:27 +02:00
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	2019-01-24 13:32:23 +01:00
rtl.scss	RTL: fix toot privacy preferences radio buttonss (#9146)	2018-10-30 00:49:29 +01:00
stream_entries.scss	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
tables.scss	Fix relationship manager on narrow screens (#10293)	2019-03-17 22:36:54 +01:00
variables.scss	Separate font-family into variable (#8763)	2018-09-23 20:41:24 +02:00
widgets.scss	Make sure the instance banner is never cropped (#10702)	2019-05-05 01:07:15 +02:00