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

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

2019-04-01 21:28:31 +02:00

..

_mixins.scss

Fix hashtags select styling in default and high contrast themes (#10029)

2019-02-13 18:34:58 +01:00

about.scss

Reduce padding around logo on landing page (#10291)

2019-03-19 23:47:10 +01:00

accessibility.scss

…

accounts.scss

Add featured hashtags to profiles (#9755)

2019-02-04 04:25:59 +01:00

admin.scss

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-26 16:02:54 +01:00

basics.scss

Change error graphic to hover-to-play (#10055)

2019-02-15 23:33:25 +01:00

boost.scss

…

compact_header.scss

…

components.scss

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-30 12:36:24 +01:00

containers.scss

squashed identity proof updates (#10375)

2019-03-28 18:01:09 +01:00

dashboard.scss

Redesign admin instances area (#9645)

2019-01-08 13:39:49 +01:00

emoji_picker.scss

Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)

2019-03-30 01:41:35 +01:00

footer.scss

…

forms.scss

squashed identity proof updates (#10375)

2019-03-28 18:01:09 +01:00

introduction.scss

Add new first-time tutorial (#9531)

2018-12-17 11:07:17 +01:00

lists.scss

…

modal.scss

…

polls.scss

Add muted style for polls in web UI (#10248)

2019-03-12 22:08:18 +01:00

reset.scss

Fix Firefox scrollbar color regression in #9210 (#9908)

2019-01-24 13:32:23 +01:00

rtl.scss

RTL: fix toot privacy preferences radio buttonss (#9146)

2018-10-30 00:49:29 +01:00

stream_entries.scss

Hide blocking accounts from blocked users (#10442)

2019-04-01 20:06:13 +02:00

tables.scss

Fix relationship manager on narrow screens (#10293)

2019-03-17 22:36:54 +01:00

variables.scss

…

widgets.scss

Fix transparent avatars showing underlying elements in avatar stack and profile (#10422)

2019-03-30 01:13:19 +01:00