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

Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes

2018-05-27 13:20:15 +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

Fix lock icon position in account card (#7630)

2018-05-26 15:29:32 +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-05-27 13:20:15 +02:00

containers.scss

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

2018-05-12 15:30:06 +02:00

emoji_picker.scss

Separate high contrast theme (#7213)

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

footer.scss

In footer, replace text "Mastodon" with logo (#7545)

2018-05-19 16:10:55 +02:00

forms.scss

Bot nameplates (#7391)

2018-05-07 09:31:07 +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

Improvements to toots display in admin view (#7452)

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

variables.scss

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

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