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

Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.

2019-03-18 18:03:27 +01:00

..

_mixins.scss

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

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

about.scss

Redesign landing page (#10232)

2019-03-12 17:34:00 +01:00

accessibility.scss

Add a few black emojis that are to have a white outline (#8597)

2018-09-10 18:26:47 +02:00

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-14 17:17:20 +01:00

basics.scss

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

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

boost.scss

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +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

2019-03-16 20:59:33 +01:00

containers.scss

Fix new hashtag page's items not being full-width on mobile (#9852)

2019-01-18 20:58:11 +01:00

dashboard.scss

Redesign admin instances area (#9645)

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

emoji_picker.scss

Fix compilation after emoji-picker change

2019-03-16 21:40:50 +01:00

footer.scss

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

forms.scss

Redesign landing page (#10232)

2019-03-12 17:34:00 +01:00

introduction.scss

Add new first-time tutorial (#9531)

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

lists.scss

Restore vanilla components

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

modal.scss

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

2018-07-09 07:13:59 +02:00

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

undo part of PR 8202 to fix RTL (#8979)

2018-10-15 04:39:20 +02:00

tables.scss

Fix relationship manager on narrow screens (#10293)

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

variables.scss

Separate font-family into variable (#8763)

2018-09-23 20:41:24 +02:00

widgets.scss

Redesign landing page (#10232)

2019-03-12 17:34:00 +01:00