mastodon/app/javascript/styles/mastodon
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
..
_mixins.scss Allow joining several hashtags in a single column (#8904) 2018-11-05 18:53:25 +01:00
about.scss Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02: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 profile directory (#9427) 2018-12-06 17:36:11 +01:00
admin.scss Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
basics.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +02: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 2018-12-19 12:58:49 +01:00
containers.scss Remove "most popular" tab from profile directory, add responsive design (#9539) 2018-12-17 03:14:28 +01:00
dashboard.scss Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
emoji_picker.scss Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772) 2018-06-09 22:20:57 +02:00
footer.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
forms.scss Fix padding on select elements in preferences (#9517) 2018-12-14 01:44:39 +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
reset.scss fix(reset): Property name for styled scrollbars (#9210) 2018-11-05 18:51:26 +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 Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
variables.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +02:00
widgets.scss Remove "most popular" tab from profile directory, add responsive design (#9539) 2018-12-17 03:14:28 +01:00