Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		2018-12-18 16:55:15 +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	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02: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-18 16:55:15 +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	Separate font-family into variable (#8763)	2018-09-23 20:41:24 +02: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	…
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