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

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

2018-06-21 20:49:57 +02:00

..

_mixins.scss

Restore vanilla components

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

about.scss

Fix color of /about/more link anchors (#7618)

2018-05-25 16:48:17 +02:00

accounts.scss

Add autofollow option to invites (#7805)

2018-06-15 18:00:23 +02:00

admin.scss

Improvements to toots display in admin view (#7452)

2018-05-12 17:44:15 +02:00

basics.scss

Add color variables of texts for better accesibility (#7125)

2018-04-18 16:52:15 +02:00

boost.scss

Add color variables of texts for better accesibility (#7125)

2018-04-18 16:52:15 +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-06-21 20:49:57 +02:00

containers.scss

Combine similar components into one on public UI (#7458)

2018-05-12 15:30:06 +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

Add "Edit profile" link to public profile page, increase bottom padding (#7754)

2018-06-07 22:40:55 +02:00

forms.scss

Allow selecting default posting language instead of auto-detect (#7828)

2018-06-17 18:57:31 +02:00

landing_strip.scss

Separate high contrast theme (#7213)

2018-04-21 21:35:55 +02:00

lists.scss

Restore vanilla components

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

modal.scss

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-19 15:22:10 -06:00

reset.scss

Fix webkit scrollbars (#7191)

2018-04-19 23:35:47 +02:00

rtl.scss

Fix #6757: Adjust RTL styles for landing page (#6768)

2018-03-13 08:14:08 +01:00

stream_entries.scss

Separate high contrast theme (#7213)

2018-04-21 21:35:55 +02:00

tables.scss

Add vendor prefix for background-clip (#7727)

2018-06-04 13:24:20 +02:00

variables.scss

Fix color mistakes in mastodon-light theme (#7626)

2018-05-26 10:53:44 +02:00