diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-18 22:05:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-18 22:05:11 +0100 |
| commit | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (patch) | |
| tree | dfeaba762dfa49844cc5cf6140deb30874734a46 /.prettierignore | |
| parent | 2be88d1930433f55e5ae17174f3711cefb3d5158 (diff) | |
| parent | ea9a1d79df60749eb21fb592c608dcaa4c935c75 (diff) | |
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to '.prettierignore')
| -rw-r--r-- | .prettierignore | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/.prettierignore b/.prettierignore index dc8c53693..e55c28416 100644 --- a/.prettierignore +++ b/.prettierignore @@ -71,9 +71,18 @@ docker-compose.override.yml /app/javascript/mastodon/locales /config/locales +# Ignore vendored CSS reset +app/javascript/styles/mastodon/reset.scss + +# Ignore glitch-soc emoji map file +/app/javascript/flavours/glitch/features/emoji/emoji_map.json + # Ignore glitch-soc locale files /app/javascript/flavours/glitch/locales /config/locales-glitch -# Ignore glitch-soc emoji map file -/app/javascript/flavours/glitch/features/emoji/emoji_map.json +# Ignore glitch-soc vendored CSS reset +app/javascript/flavours/glitch/styles/reset.scss + +# Ignore win95 theme +app/javascript/styles/win95.scss |