catstodon/app/javascript/styles/mastodon
Jeremy Kescher 68101baae1
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/controllers/settings/preferences_controller.rb
#	app/javascript/mastodon/utils/resize_image.js
#	app/lib/user_settings_decorator.rb
#	app/models/media_attachment.rb
#	app/models/user.rb
#	app/views/settings/preferences/appearance/show.html.haml
#	app/workers/scheduler/indexing_scheduler.rb
#	config/settings.yml
#	db/schema.rb
2023-04-03 21:50:15 +02:00
..
_mixins.scss Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +02:00
about.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
accessibility.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
accounts.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
basics.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
boost.scss Fix styling of boost button in media modal not reflecting ability to boost (#16387) 2021-06-25 04:45:30 +02:00
branding.scss Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
components.scss Merge remote-tracking branch 'upstream/main' into develop 2023-04-03 21:50:15 +02:00
containers.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
dashboard.scss Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +02:00
emoji_picker.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
forms.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
polls.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
reset.scss Fix Firefox scrollbar color regression in #9210 (#9908) 2019-01-24 13:32:23 +01:00
rich_text.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
rtl.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
statuses.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
tables.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
variables.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
widgets.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00