chuckya/app/javascript/styles/mastodon
Claire 4ed629cd7e Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +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 Add authorized_fetch server setting in addition to env var (#25798) 2023-09-01 15:41:10 +02:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2023-07-05 12:01:26 +02:00
basics.scss change column link to add a better keyboard focus indicator (#26278) 2023-08-02 19:33:41 +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 commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream 2023-09-02 13:50:16 +02:00
containers.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
dashboard.scss Change button colors to increase hover/focus contrast and consistency (#25677) 2023-07-03 11:32:31 +02:00
emoji_picker.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
forms.scss Add authorized_fetch server setting in addition to env var (#25798) 2023-09-01 15:41:10 +02:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
polls.scss Revert poll colors to green outside of compose form (#26164) 2023-07-25 15:32:59 +02:00
reset.scss Fix Firefox scrollbar color regression in #9210 (#9908) 2019-01-24 13:32:23 +01:00
rich_text.scss Fix styling regressions from RTL layout refactor (#24415) 2023-04-04 16:48:34 +02:00
rtl.scss Fix styling regressions from RTL layout refactor (#24415) 2023-04-04 16:48:34 +02:00
statuses.scss Fix follow link style in embeds (#25965) 2023-07-13 12:58:56 +02:00
tables.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
variables.scss change column link to add a better keyboard focus indicator (#26278) 2023-08-02 19:33:41 +02:00
widgets.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00