Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
_mixins.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
about.scss	Change full logo to use primary text color of the given theme (#10994)	2019-06-08 15:30:06 +02: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	Change preferences page into appearance, notifications, and other (#10977)	2019-06-07 03:39:24 +02:00
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
basics.scss	Fix edit media modal on small screens, touch events (#11573)	2019-08-15 20:28:56 +02: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-08-19 21:49:35 +02:00
containers.scss	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00
dashboard.scss	Redesign admin instances area (#9645)	2019-01-08 13:39:49 +01:00
emoji_picker.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
footer.scss	Use <use /> to render transparent SVG logo instead of inserting it (#10845)	2019-05-27 03:33:39 +02:00
forms.scss	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +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	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	2019-01-24 13:32:23 +01:00
rtl.scss	Fix RTL layout not being RTL within the columns area (#10990)	2019-06-07 23:35:26 +02:00
statuses.scss	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
tables.scss	Add public blocks to /about/blocks (#11298)	2019-08-19 11:35:48 +02:00
variables.scss	Separate font-family into variable (#8763)	2018-09-23 20:41:24 +02:00
widgets.scss	Add trends to public pages sidebar (#11594)	2019-08-18 14:55:32 +02:00