mastodon/app/javascript/styles/mastodon
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
_mixins.scss
about.scss Remove duplicate CSS properties (#16278) 2021-05-19 23:51:52 +02:00
accessibility.scss
accounts.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
basics.scss
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
components.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00
containers.scss Fix logo button style more (#15458) 2020-12-30 23:18:39 +01:00
dashboard.scss Add trending links (#16917) 2021-11-25 13:07:38 +01:00
emoji_picker.scss Fix background-color of emoji-mart selector (#17011) 2021-11-19 18:21:37 +01:00
footer.scss Fix privacy policy link not being visible on small screens (#17533) 2022-02-13 02:52:34 +01:00
forms.scss Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
introduction.scss
lists.scss
modal.scss Use custom mascot on static share page (#15687) 2021-02-11 02:18:56 +01:00
polls.scss Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
reset.scss
rtl.scss Improve hover and focus style in columns settings (#16222) 2021-10-01 00:55:51 +02:00
statuses.scss Fix logo button style more (#15458) 2020-12-30 23:18:39 +01:00
tables.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
variables.scss Add interrelationship icon (#15149) 2020-11-12 17:43:12 +01:00
widgets.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00