Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

_mixins.scss

Restore vanilla components

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

about.scss

Separate high contrast theme (#7213)

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

accounts.scss

Improve rendering of bio fields (#7353)

2018-05-05 00:55:09 +02:00

admin.scss

Improve admin UI for accounts (#7360)

2018-05-05 23:06:29 +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/master

2018-05-10 00:03:28 +02:00

containers.scss

Show card modal on public pages (#7428)

2018-05-09 16:22:52 +02:00

emoji_picker.scss

Separate high contrast theme (#7213)

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

footer.scss

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

2018-04-18 16:52:15 +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

Improve report layout (#7188)

2018-04-20 02:28:48 +02:00

variables.scss

Separate high contrast theme (#7213)

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