diff --git a/.prettierrc b/.prettierrc index 8d33878..5bd1ab7 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,6 +1,6 @@ { "tabWidth": 4, "singleQuote": true, - "plugins": ["prettier-plugin-svelte"], + "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] } diff --git a/package-lock.json b/package-lock.json index 139cdb5..54d4f7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,8 +29,9 @@ "highlight.js": "^11.9.0", "markdown-it": "^14.0.0", "postcss": "^8.4.35", - "prettier": "^3.1.1", + "prettier": "^3.2.5", "prettier-plugin-svelte": "^3.1.2", + "prettier-plugin-tailwindcss": "^0.5.12", "svelte": "^4.2.7", "svelte-check": "^3.6.0", "tailwindcss": "^3.4.1", @@ -3475,6 +3476,79 @@ "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0" } }, + "node_modules/prettier-plugin-tailwindcss": { + "version": "0.5.12", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.12.tgz", + "integrity": "sha512-o74kiDBVE73oHW+pdkFSluHBL3cYEvru5YgEqNkBMFF7Cjv+w1vI565lTlfoJT4VLWDe0FMtZ7FkE/7a4pMXSQ==", + "dev": true, + "engines": { + "node": ">=14.21.3" + }, + "peerDependencies": { + "@ianvs/prettier-plugin-sort-imports": "*", + "@prettier/plugin-pug": "*", + "@shopify/prettier-plugin-liquid": "*", + "@trivago/prettier-plugin-sort-imports": "*", + "prettier": "^3.0", + "prettier-plugin-astro": "*", + "prettier-plugin-css-order": "*", + "prettier-plugin-import-sort": "*", + "prettier-plugin-jsdoc": "*", + "prettier-plugin-marko": "*", + "prettier-plugin-organize-attributes": "*", + "prettier-plugin-organize-imports": "*", + "prettier-plugin-sort-imports": "*", + "prettier-plugin-style-order": "*", + "prettier-plugin-svelte": "*" + }, + "peerDependenciesMeta": { + "@ianvs/prettier-plugin-sort-imports": { + "optional": true + }, + "@prettier/plugin-pug": { + "optional": true + }, + "@shopify/prettier-plugin-liquid": { + "optional": true + }, + "@trivago/prettier-plugin-sort-imports": { + "optional": true + }, + "prettier-plugin-astro": { + "optional": true + }, + "prettier-plugin-css-order": { + "optional": true + }, + "prettier-plugin-import-sort": { + "optional": true + }, + "prettier-plugin-jsdoc": { + "optional": true + }, + "prettier-plugin-marko": { + "optional": true + }, + "prettier-plugin-organize-attributes": { + "optional": true + }, + "prettier-plugin-organize-imports": { + "optional": true + }, + "prettier-plugin-sort-imports": { + "optional": true + }, + "prettier-plugin-style-order": { + "optional": true + }, + "prettier-plugin-svelte": { + "optional": true + }, + "prettier-plugin-twig-melody": { + "optional": true + } + } + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/package.json b/package.json index 79bafb4..e42223c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "glass_cursor", - "version": "0.0.1", + "version": "1.0", "private": true, "scripts": { "dev": "vite dev", @@ -35,8 +35,9 @@ "highlight.js": "^11.9.0", "markdown-it": "^14.0.0", "postcss": "^8.4.35", - "prettier": "^3.1.1", + "prettier": "^3.2.5", "prettier-plugin-svelte": "^3.1.2", + "prettier-plugin-tailwindcss": "^0.5.12", "svelte": "^4.2.7", "svelte-check": "^3.6.0", "tailwindcss": "^3.4.1", diff --git a/src/lib/app.css b/src/lib/app.css index e310c81..4be713b 100644 --- a/src/lib/app.css +++ b/src/lib/app.css @@ -4,23 +4,23 @@ @layer components { .link { - @apply text-blue-600 dark:text-blue-500 hover:underline; + @apply text-blue-600 hover:underline dark:text-blue-500; } .btn { - @apply bg-neutral-700 hover:bg-neutral-600 text-white rounded-full py-2 px-6 mx-2 font-medium shadow; + @apply mx-2 rounded-full bg-neutral-700 px-6 py-2 font-medium text-white shadow hover:bg-neutral-600; } .btn-blue { - @apply bg-blue-700 hover:bg-blue-600 border-0; + @apply border-0 bg-blue-700 hover:bg-blue-600; } .btn-red { - @apply bg-red-700 hover:bg-red-600 border-0; + @apply border-0 bg-red-700 hover:bg-red-600; } .input { - @apply bg-neutral-200 dark:bg-neutral-800 border-2 border-neutral-300 dark:border-neutral-700 flex-grow rounded-full py-3 px-6 focus:shadow-lg text-inherit inline; + @apply inline flex-grow rounded-full border-2 border-neutral-300 bg-neutral-200 px-6 py-3 text-inherit focus:shadow-lg dark:border-neutral-700 dark:bg-neutral-800; } } diff --git a/src/lib/components/ConfirmDeletion.svelte b/src/lib/components/ConfirmDeletion.svelte index 83b5544..5fe8765 100644 --- a/src/lib/components/ConfirmDeletion.svelte +++ b/src/lib/components/ConfirmDeletion.svelte @@ -12,13 +12,13 @@ -

Delete the Note?

+

Delete the Note?

You are about the delete the note named "{confirmDeleteTargetName}". Are you sure? This action cannot be reverted.

-
+
-
+