1
0
puyopuyotetr.is/app/javascript/styles/mastodon
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +01:00
..
_mixins.scss Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +02:00
about.scss Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +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 Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"" 2022-11-12 10:17:22 +01:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01: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
components.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
containers.scss Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +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 Fix double button to clear emoji search input (#19888) 2022-11-07 03:40:54 +01:00
forms.scss Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"" 2022-11-12 10:17:22 +01: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 public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
statuses.scss Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +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 intermediary responsive layout, accessibility on navigation in web UI (#19324) 2022-10-09 15:55:32 +02:00
widgets.scss Fix wrong size of avatars in admin UI (#19457) 2022-10-25 21:43:33 +02:00