From d49b78d46f6d131d6d0194397cc7521b6c5d4cbf Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 12 Aug 2019 02:18:55 +0100 Subject: [PATCH] Split stylesheets, remove sugarss --- package.json | 1 - src/assets/css/components.css | 17 +++++++++++++++++ src/assets/css/tailwind.css | 26 +++++--------------------- src/assets/css/utilities.css | 4 ++++ yarn.lock | 9 +-------- 5 files changed, 27 insertions(+), 30 deletions(-) create mode 100644 src/assets/css/components.css create mode 100644 src/assets/css/utilities.css diff --git a/package.json b/package.json index a813769..d89c97b 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "sugarss": "^2.0.0", "tailwindcss": "^1.0.1", "tailwindcss-skip-link": "^1.0.1", "vue": "^2.6.6" diff --git a/src/assets/css/components.css b/src/assets/css/components.css new file mode 100644 index 0000000..30dd230 --- /dev/null +++ b/src/assets/css/components.css @@ -0,0 +1,17 @@ +#main a { + @apply text-blue-300 no-underline border-b border-blue-100 border-dotted; + + &:hover, + &:focus { + @apply text-blue-100 border-solid + } +} + +#footer a { + @apply text-white no-underline border-b border-dotted border-white; + + &:hover, + &:focus { + @apply border-none + } +} diff --git a/src/assets/css/tailwind.css b/src/assets/css/tailwind.css index aa70b3c..56e0ce6 100644 --- a/src/assets/css/tailwind.css +++ b/src/assets/css/tailwind.css @@ -1,23 +1,7 @@ -@tailwind base +@import 'tailwindcss/base'; -#main a - @apply text-blue-300 no-underline border-b border-blue-100 border-dotted +@import 'tailwindcss/components'; +@import './components.css'; - &:hover, - &:focus - @apply text-blue-100 border-solid - -#footer a - @apply text-white no-underline border-b border-dotted border-white - - &:hover, - &:focus - @apply border-none - -@tailwind components - -@tailwind utilities - -.skip-link:focus - left: 50% - transform: translateX(-50%) +@import 'tailwindcss/utilities'; +@import './utilities.css'; diff --git a/src/assets/css/utilities.css b/src/assets/css/utilities.css new file mode 100644 index 0000000..ba45eb0 --- /dev/null +++ b/src/assets/css/utilities.css @@ -0,0 +1,4 @@ +.skip-link:focus { + left: 50%; + transform: translateX(-50%) +} diff --git a/yarn.lock b/yarn.lock index af3aa39..60c8dff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6409,7 +6409,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.17, postcss@^7.0.2, postcss@^7.0.5: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.14, postcss@^7.0.17, 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== @@ -7571,13 +7571,6 @@ 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"