Claire e855df149b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.		2021-10-25 20:28:51 +02:00
..
_mixins.scss	…
about.scss	Remove duplicate CSS properties (#16278)	2021-05-19 23:51:52 +02:00
accessibility.scss	…
accounts.scss	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
admin.scss	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-25 20:28:51 +02:00
basics.scss	…
boost.scss	Fix styling of boost button in media modal not reflecting ability to boost (#16387)	2021-06-25 04:45:30 +02:00
compact_header.scss	…
components.scss	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
containers.scss	Fix logo button style more (#15458)	2020-12-30 23:18:39 +01:00
dashboard.scss	Enhance dashboard styles (#16884)	2021-10-21 06:24:34 +02:00
emoji_picker.scss	Add assets from Twemoji 13.1.0 (#16345)	2021-06-01 14:35:49 +02:00
footer.scss	…
forms.scss	Add authentication history (#16408)	2021-06-21 17:07:30 +02:00
introduction.scss	…
lists.scss	…
modal.scss	Use custom mascot on static share page (#15687)	2021-02-11 02:18:56 +01:00
polls.scss	…
reset.scss	…
rtl.scss	Improve hover and focus style in columns settings (#16222)	2021-10-01 00:55:51 +02:00
statuses.scss	Fix logo button style more (#15458)	2020-12-30 23:18:39 +01:00
tables.scss	…
variables.scss	Add interrelationship icon (#15149)	2020-11-12 17:43:12 +01:00
widgets.scss	Fix deprecated slash as division in SASS files (#16347)	2021-06-01 23:47:27 +02:00