rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/app/javascript/styles/mastodon
History
Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream added lines close to a glitch-soc only line, not a real conflict.
  Applied upstream's changes (added hooks) while keeping glitch-soc's changes
  (`local_only` scope).
- `config/environments/production.rb`:
  Upstream removed a header, while we have glitch-soc specific ones.
  Removed the header removed upstream.
 		2023-03-22 19:50:11 +01:00
..
_mixins.scss
…
about.scss
…
accessibility.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
accounts.scss
…
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
basics.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
boost.scss
…
branding.scss
…
components.scss Merge branch 'main' into glitch-soc/merge-upstream 2023-03-22 19:50:11 +01:00
containers.scss
…
dashboard.scss
…
emoji_picker.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
forms.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
lists.scss
…
modal.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
polls.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
reset.scss
…
rich_text.scss Add support for incoming rich text (#23913) 2023-03-03 20:19:29 +01:00
rtl.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
statuses.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
tables.scss Stick batch table toolbar to the top (#20442) 2022-11-13 21:02:28 +01:00
variables.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
widgets.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00