Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

2019-06-10 18:59:53 +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-06-07 17:00:36 +02:00

basics.scss

Fix sass-lint config (#10982)

2019-06-06 18:51:46 +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-06-10 18:59:53 +02:00

containers.scss

Change full logo to use primary text color of the given theme (#10994)

2019-06-08 15:30:06 +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 preferences page into appearance, notifications, and other (#10977)

2019-06-07 03:39:24 +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

stream_entries.scss

Improve light theme (#10992)

2019-06-08 10:23:41 +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