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

Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb

2018-10-01 12:43:20 +02:00

..

_mixins.scss

Restore vanilla components

2017-11-17 19:29:16 -08:00

about.scss

Revert Font Awesome 5 upgrade (#8810)

2018-09-28 02:11:14 +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

Revert Font Awesome 5 upgrade (#8810)

2018-09-28 02:11:14 +02:00

admin.scss

Revert Font Awesome 5 upgrade (#8810)

2018-09-28 02:11:14 +02:00

basics.scss

Separate font-family into variable (#8763)

2018-09-23 20:41:24 +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

2018-10-01 12:43:20 +02:00

containers.scss

Separate font-family into variable (#8763)

2018-09-23 20:41:24 +02:00

dashboard.scss

Separate font-family into variable (#8763)

2018-09-23 20:41:24 +02:00

emoji_picker.scss

Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772)

2018-06-09 22:20:57 +02:00

footer.scss

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

forms.scss

Revert Font Awesome 5 upgrade (#8810)

2018-09-28 02:11:14 +02: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

reset.scss

feat(css): Styled scrollbars in Firefox Nightly (#8653)

2018-09-09 02:08:49 +02:00

rtl.scss

RTL: fix margins: public-layout.header.nav-button (#8823)

2018-09-29 11:04:26 +09:00

stream_entries.scss

Make unfollow button light up red when hovered (#8286)

2018-08-19 03:28:43 +02:00

tables.scss

Revert Font Awesome 5 upgrade (#8810)

2018-09-28 02:11:14 +02:00

variables.scss

Separate font-family into variable (#8763)

2018-09-23 20:41:24 +02:00

widgets.scss

Revert Font Awesome 5 upgrade (#8810)

2018-09-28 02:11:14 +02:00