From cd9def7e0a2fabdd7ec42091d52dee95dbe11648 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 8 Jul 2019 22:07:31 +0100 Subject: [PATCH] Use sugarss --- package.json | 2 ++ postcss.config.js | 1 + src/assets/css/components/links.css | 3 +-- src/assets/css/components/search-form.css | 6 ++---- src/assets/css/custom-components.css | 4 ++-- src/assets/css/tailwind.css | 8 ++++---- src/components/AlertMessage.vue | 8 +++----- yarn.lock | 9 ++++++++- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 154737a..5fa6b8a 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,8 @@ }, "dependencies": { "core-js": "^2.6.5", + "postcss": "^7.0.17", + "sugarss": "^2.0.0", "tailwindcss-interaction-variants": "^2.0.0-beta.1", "tailwindcss-spaced-items": "^0.1.0", "tailwindcss-transforms": "^2.0.0-beta.1", diff --git a/postcss.config.js b/postcss.config.js index a41b7b3..dd3d186 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,4 +1,5 @@ module.exports = { + parser: 'sugarss', plugins: { 'postcss-import': {}, tailwindcss: "./tailwind.config.js", diff --git a/src/assets/css/components/links.css b/src/assets/css/components/links.css index 2ca9fc3..4c99b8f 100644 --- a/src/assets/css/components/links.css +++ b/src/assets/css/components/links.css @@ -1,3 +1,2 @@ -a:hover { +a:hover @apply underline -} diff --git a/src/assets/css/components/search-form.css b/src/assets/css/components/search-form.css index 3442fe7..f6648c6 100644 --- a/src/assets/css/components/search-form.css +++ b/src/assets/css/components/search-form.css @@ -1,5 +1,3 @@ -.search-form { - > input:focus + svg { +.search-form + > input:focus + svg @apply opacity-100 - } -} diff --git a/src/assets/css/custom-components.css b/src/assets/css/custom-components.css index fcd9676..71f91e3 100644 --- a/src/assets/css/custom-components.css +++ b/src/assets/css/custom-components.css @@ -1,2 +1,2 @@ -@import 'components/links'; -@import 'components/search-form'; +@import 'components/links' +@import 'components/search-form' diff --git a/src/assets/css/tailwind.css b/src/assets/css/tailwind.css index 81a75bc..9fb750e 100644 --- a/src/assets/css/tailwind.css +++ b/src/assets/css/tailwind.css @@ -1,6 +1,6 @@ -@import 'tailwindcss/base'; +@import 'tailwindcss/base' -@import 'tailwindcss/components'; -@import 'custom-components'; +@import 'tailwindcss/components' +@import 'custom-components' -@import 'tailwindcss/utilities'; +@import 'tailwindcss/utilities' diff --git a/src/components/AlertMessage.vue b/src/components/AlertMessage.vue index 4fa5e8b..08ffe91 100644 --- a/src/components/AlertMessage.vue +++ b/src/components/AlertMessage.vue @@ -5,12 +5,10 @@ diff --git a/yarn.lock b/yarn.lock index 9eefc03..183ea17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7621,7 +7621,7 @@ postcss@^6.0.1, postcss@^6.0.23, postcss@^6.0.9: source-map "^0.6.1" supports-color "^5.4.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.5: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.5: version "7.0.17" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f" integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ== @@ -8940,6 +8940,13 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" +sugarss@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d" + integrity sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ== + dependencies: + postcss "^7.0.2" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"