nyastodon/app/javascript/styles/mastodon
Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml

Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.

Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
2018-10-26 20:41:43 +02:00
..
_mixins.scss Restore vanilla components 2017-11-17 19:29:16 -08: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 Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02: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-10-22 17:51:38 +02:00
containers.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +02: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 domain label position and color (#9033) 2018-10-21 14:35:25 +09: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 feat(css): Styled scrollbars in Firefox Nightly (#8653) 2018-09-09 02:08:49 +02:00
rtl.scss Fix RTL layout of status display names (#9075) 2018-10-24 18:18:08 +02: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 Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00