diff --git a/vuejs/package.json b/vuejs/package.json index 9b8da7d..66a7ea3 100644 --- a/vuejs/package.json +++ b/vuejs/package.json @@ -11,6 +11,7 @@ "dependencies": { "axios": "^0.18.0", "core-js": "^2.6.5", + "postcss-import": "^12.0.1", "postcss-nested": "^4.1.2", "qs": "^6.8.0", "tailwindcss": "^1.1.2", diff --git a/vuejs/postcss.config.js b/vuejs/postcss.config.js index bb7e10b..c9d57ba 100644 --- a/vuejs/postcss.config.js +++ b/vuejs/postcss.config.js @@ -1,5 +1,6 @@ module.exports = { plugins: { + 'postcss-import': {}, tailwindcss: {}, 'postcss-nested': {}, autoprefixer: {} diff --git a/vuejs/src/assets/css/base.css b/vuejs/src/assets/css/base.css new file mode 100644 index 0000000..1513251 --- /dev/null +++ b/vuejs/src/assets/css/base.css @@ -0,0 +1,17 @@ +h1, +h2 { + @apply font-semibold +} + +input, +textarea { + @apply mt-1 p-2 w-full border border-gray-400 +} + +input[type=submit] { + @apply w-full; + + @screen sm { + @apply w-auto + } +} diff --git a/vuejs/src/assets/css/tailwind.css b/vuejs/src/assets/css/tailwind.css index 00c4b7a..d235968 100644 --- a/vuejs/src/assets/css/tailwind.css +++ b/vuejs/src/assets/css/tailwind.css @@ -1,23 +1,6 @@ -@tailwind base; +@import 'tailwindcss/base'; +@import './base.css'; -h1, -h2 { - @apply font-semibold -} +@import 'tailwindcss/components'; -input, -textarea { - @apply mt-1 p-2 w-full border border-gray-400 -} - -input[type=submit] { - @apply w-full; - - @screen sm { - @apply w-auto - } -} - -@tailwind components; - -@tailwind utilities; +@import 'tailwindcss/utilities'; diff --git a/vuejs/yarn.lock b/vuejs/yarn.lock index ddc6673..b8ad1f2 100644 --- a/vuejs/yarn.lock +++ b/vuejs/yarn.lock @@ -7157,7 +7157,7 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -pify@^2.0.0: +pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= @@ -7303,6 +7303,16 @@ postcss-functions@^3.0.0: postcss "^6.0.9" postcss-value-parser "^3.3.0" +postcss-import@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" + integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== + dependencies: + postcss "^7.0.1" + postcss-value-parser "^3.2.3" + read-cache "^1.0.0" + resolve "^1.1.7" + postcss-js@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.1.tgz#4154e906ff410930afab63a24210be1b831e89a9" @@ -7586,7 +7596,7 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: +postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== @@ -7865,6 +7875,13 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +read-cache@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q= + dependencies: + pify "^2.3.0" + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -8209,6 +8226,13 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= +resolve@^1.1.7: + version "1.12.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" + integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== + dependencies: + path-parse "^1.0.6" + resolve@^1.10.0, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1: version "1.11.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232"