1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-05 10:18:45 +09:00
YuruToot/app/javascript/styles/mastodon
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +02:00
..
_mixins.scss Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +02:00
about.scss Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
accessibility.scss Improve rendering of emoji which do not contrast with background (#13772) 2020-06-09 10:28:23 +02:00
accounts.scss Change "Allow trends without prior review" setting to include statuses (#17977) 2022-08-28 04:00:39 +02:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
basics.scss Fix logo gradient not working on some Safari and Blink-based browsers (#18634) 2022-06-10 17:34:59 +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
compact_header.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
components.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
containers.scss Fix contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
dashboard.scss Fix contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
emoji_picker.scss Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
footer.scss Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
forms.scss Change "Allow trends without prior review" setting to include statuses (#17977) 2022-08-28 04:00:39 +02:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Use custom mascot on static share page (#15687) 2021-02-11 02:18:56 +01:00
polls.scss Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
reset.scss Fix Firefox scrollbar color regression in #9210 (#9908) 2019-01-24 13:32:23 +01:00
rtl.scss Change appearance of account cards in web UI (#17689) 2022-03-07 11:38:52 +01:00
statuses.scss Fix contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
tables.scss Add ability to select all accounts matching search for batch actions (#19053) 2022-08-25 23:33:34 +02:00
variables.scss Fix contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
widgets.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00