Merge pull request #189 from oystersjp/feature/v2-style

[oysters.dev v2] CSSスタイル反映
oystersjp · Aug 22, 2024 · a2c0fce · a2c0fce
2 parents 4bf60fe + ce64341
commit a2c0fce
Show file tree

Hide file tree

Showing 68 changed files with 625 additions and 377 deletions.
diff --git a/.prettierrc.mjs b/.prettierrc.mjs
@@ -1,6 +1,6 @@
 /** @type {import("prettier").Config} */
 export default {
-  plugins: ['prettier-plugin-astro'],
+  plugins: ['prettier-plugin-astro', 'prettier-plugin-tailwindcss'],
   semi: false,
   singleQuote: true,
   trailingComma: 'none',

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,6 +1,7 @@
 {
   "recommendations": [
     "astro-build.astro-vscode",
+    "bradlc.vscode-tailwindcss",
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
     "stylelint.vscode-stylelint"

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,6 +6,9 @@
     "typescript",
     "typescriptreact"
   ],
+  "files.associations": {
+    "*.css": "tailwindcss"
+  },
   "stylelint.validate": ["html", "astro"],
   "prettier.documentSelectors": ["**/*.astro"],
   "[astro]": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
     "postcss-html": "^1.7.0",
     "prettier": "^3.3.3",
     "prettier-plugin-astro": "^0.14.1",
+    "prettier-plugin-tailwindcss": "^0.6.6",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recommended": "^14.0.1"
   }

diff --git a/src/components/Activities/Activities.astro b/src/components/Activities/Activities.astro
diff --git a/src/components/Activities/assets/coworking.svg b/src/components/Activities/assets/coworking.svg
diff --git a/src/components/Activities/assets/event.svg b/src/components/Activities/assets/event.svg