Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		2019-09-13 18:13:43 +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-09-13 18:13:43 +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-09-05 11:36:41 +02:00
containers.scss	Fix unused CSS (#11824)	2019-09-13 16:00:47 +02:00
dashboard.scss	Fix height of dashboard counters (#11736)	2019-09-02 18:11:34 +02:00
emoji_picker.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
footer.scss	Fix Mastodon logo style on hover on public pages' footer (#11735)	2019-09-02 18:12:12 +02:00
forms.scss	Change account deletion page to have better explanations (#11753)	2019-09-04 04:13:54 +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 display of long poll options (#11717)	2019-09-13 16:04:09 +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 batch actions and categories to admin UI for custom emojis (#11793)	2019-09-09 22:44:17 +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