nyastodon/app/javascript/styles/mastodon
Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/models/account.rb`:
  Textual conflict only caused by glitch-soc using a different value
  for character limits in a nearby line.
  Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
  Attribute added to a tag modified by glitch-soc.
  Added upstream's attributes.
- `yarn.lock`:
  Upstream added/updated dependencies close to glitch-soc-only ones.
  Updated/added upstream dependencies.
2022-06-02 09:49:38 +02:00
..
_mixins.scss Revert "Avoid using uppercase text-transform (#12684)" (#12987) 2020-01-27 13:44:29 +01:00
about.scss Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +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 Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
basics.scss Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +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
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-06-02 09:49:38 +02:00
containers.scss Change appearance of account cards in web UI (#17689) 2022-03-07 11:38:52 +01:00
dashboard.scss Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
emoji_picker.scss Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
footer.scss Fix privacy policy link not being visible on small screens (#17533) 2022-02-13 02:52:34 +01:00
forms.scss Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +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 Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
tables.scss Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
variables.scss Replace from Code Climate to Super-Linter (#18587) 2022-06-01 19:22:35 +02:00
widgets.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00