Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb

2019-07-23 10:51:07 +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

…

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

Change single-column mode to scroll the whole page (#11359)

2019-07-19 09:25:22 +02:00

boost.scss

…

compact_header.scss

…

components.scss

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

containers.scss

Add ActivityPub actor representing the entire server (#11321)

2019-07-19 01:44:42 +02:00

dashboard.scss

…

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

…

lists.scss

…

modal.scss

…

polls.scss

Fix sass-lint config (#10982)

2019-06-06 18:51:46 +02:00

reset.scss

…

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

…

variables.scss

…

widgets.scss

…