Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb		2019-03-13 15:16:02 +01:00
..
_mixins.scss	Fix hashtags select styling in default and high contrast themes (#10029)	2019-02-13 18:34:58 +01:00
about.scss	Redesign landing page (#10232)	2019-03-12 17:34:00 +01:00
accessibility.scss	…
accounts.scss	Add featured hashtags to profiles (#9755)	2019-02-04 04:25:59 +01:00
admin.scss	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
basics.scss	Change error graphic to hover-to-play (#10055)	2019-02-15 23:33:25 +01:00
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
containers.scss	Fix new hashtag page's items not being full-width on mobile (#9852)	2019-01-18 20:58:11 +01:00
dashboard.scss	Redesign admin instances area (#9645)	2019-01-08 13:39:49 +01:00
emoji_picker.scss	…
footer.scss	…
forms.scss	Redesign landing page (#10232)	2019-03-12 17:34:00 +01:00
introduction.scss	…
lists.scss	…
modal.scss	…
polls.scss	Add muted style for polls in web UI (#10248)	2019-03-12 22:08:18 +01:00
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	2019-01-24 13:32:23 +01:00
rtl.scss	…
stream_entries.scss	…
tables.scss	…
variables.scss	…
widgets.scss	Redesign landing page (#10232)	2019-03-12 17:34:00 +01:00