From 9775734ad0549ca86f68b0e68deec12041e51d76 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 10 Mar 2019 00:14:38 +0000 Subject: [PATCH 01/13] Require 'next' version of Tailwind --- package.json | 4 +- yarn.lock | 163 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 119 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 66f9aef..cd01f78 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dependencies": { "node-sass": "^4.10.0", "sass-loader": "^7.1.0", - "tailwindcss": "^0.7.2", + "tailwindcss": "https://github.com/tailwindcss/tailwindcss.git#next", "tailwindcss-skip-link": "^1.0.1", "vue": "^2.5.17" }, @@ -39,7 +39,7 @@ }, "postcss": { "plugins": { - "tailwindcss": "./tailwind.js", + "tailwindcss": "./tailwind.config.js", "autoprefixer": {} } }, diff --git a/yarn.lock b/yarn.lock index aaebac7..e9a4737 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1128,15 +1128,16 @@ autoprefixer@^8.6.5: postcss "^6.0.23" postcss-value-parser "^3.2.3" -autoprefixer@^9.3.1: - version "9.3.1" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e" +autoprefixer@^9.4.5: + version "9.4.10" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.10.tgz#e1be61fc728bacac8f4252ed242711ec0dcc6a7b" + integrity sha512-XR8XZ09tUrrSzgSlys4+hy5r2/z4Jp7Ag3pHm31U4g/CTccYPOVe19AkaJ4ey/vRd1sfj+5TtuD6I0PXtutjvQ== dependencies: - browserslist "^4.3.3" - caniuse-lite "^1.0.30000898" + browserslist "^4.4.2" + caniuse-lite "^1.0.30000940" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^7.0.5" + postcss "^7.0.14" postcss-value-parser "^3.3.1" aws-sign2@~0.7.0: @@ -1396,7 +1397,7 @@ browserslist@^3.2.8: caniuse-lite "^1.0.30000844" electron-to-chromium "^1.3.47" -browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.3.3: +browserslist@^4.0.0, browserslist@^4.1.0: version "4.3.4" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425" dependencies: @@ -1404,6 +1405,15 @@ browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.3.3: electron-to-chromium "^1.3.82" node-releases "^1.0.1" +browserslist@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.2.tgz#6ea8a74d6464bb0bd549105f659b41197d8f0ba2" + integrity sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg== + dependencies: + caniuse-lite "^1.0.30000939" + electron-to-chromium "^1.3.113" + node-releases "^1.1.8" + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -1533,9 +1543,10 @@ camel-case@3.0.x: no-case "^2.2.0" upper-case "^1.1.1" -camelcase-css@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-1.0.1.tgz#157c4238265f5cf94a1dffde86446552cbf3f705" +camelcase-css@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" + integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== camelcase-keys@^2.0.0: version "2.1.0" @@ -1565,10 +1576,15 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000899: version "1.0.30000909" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000909.tgz#697e8f447ca5f758e7c6cef39ec429ce18b908d3" +caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000940: + version "1.0.30000942" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000942.tgz#454139b28274bce70bfe1d50c30970df7430c6e4" + integrity sha512-wLf+IhZUy2rfz48tc40OH7jHjXjnvDFEYqBHluINs/6MgzoNLPf25zhE4NOVzqxLKndf+hau81sAW0RcGHIaBQ== + case-sensitive-paths-webpack-plugin@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.2.tgz#c899b52175763689224571dad778742e133f0192" @@ -1595,6 +1611,15 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4 escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chardet@^0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" @@ -2079,10 +2104,6 @@ css-what@2.1, css-what@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d" -css.escape@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" - cssesc@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" @@ -2091,6 +2112,11 @@ cssesc@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703" +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + cssnano-preset-default@^4.0.0, cssnano-preset-default@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.5.tgz#d1756c0259d98ad311e601ba76e95c60f6771ac1" @@ -2448,6 +2474,11 @@ ejs@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" +electron-to-chromium@^1.3.113: + version "1.3.113" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9" + integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g== + electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.82: version "1.3.84" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz#2e55df59e818f150a9f61b53471ebf4f0feecc65" @@ -3088,15 +3119,7 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-extra@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^7.0.0: +fs-extra@^7.0.0, fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" dependencies: @@ -4636,6 +4659,13 @@ node-releases@^1.0.1: dependencies: semver "^5.3.0" +node-releases@^1.1.8: + version "1.1.10" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.10.tgz#5dbeb6bc7f4e9c85b899e2e7adcc0635c9b2adf7" + integrity sha512-KbUPCpfoBvb3oBkej9+nrU0/7xPlVhmhhUJ1PZqwIP5/1dJkRWKWD3OONjo6M2J7tSCBtDCumLwwqeI+DWWaLQ== + dependencies: + semver "^5.3.0" + node-sass@^4.10.0: version "4.10.0" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4" @@ -4700,6 +4730,11 @@ normalize-url@^3.0.0: version "3.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" +normalize.css@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3" + integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg== + npm-bundled@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" @@ -5198,12 +5233,13 @@ postcss-functions@^3.0.0: postcss "^6.0.9" postcss-value-parser "^3.3.0" -postcss-js@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-1.0.1.tgz#ffaf29226e399ea74b5dce02cab1729d7addbc7b" +postcss-js@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.0.tgz#f75b70470009eb37f998ee9bb516a2899c19ef8d" + integrity sha512-9kAApW9G5kN8FkQ0ZdvSmbgbHIRrKmXtde2ZWYbwrW51gfEWfGsLlUu57mTpioPrmQlQFOgEvaeGYp+poqlX0A== dependencies: - camelcase-css "^1.0.1" - postcss "^6.0.11" + camelcase-css "^2.0.0" + postcss "^7.0.0" postcss-load-config@^2.0.0: version "2.0.0" @@ -5304,12 +5340,13 @@ postcss-modules-values@^1.3.0: icss-replace-symbols "^1.1.0" postcss "^6.0.1" -postcss-nested@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-3.0.0.tgz#cde40bd07a078565f3df72e2dc2665871c724852" +postcss-nested@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.1.2.tgz#8e0570f736bfb4be5136e31901bf2380b819a561" + integrity sha512-9bQFr2TezohU3KRSu9f6sfecXmf/x6RXDedl8CHF6fyuyVW7UqgNMRdWMHZQWuFY6Xqs2NYk+Fj4Z4vSOf7PQg== dependencies: - postcss "^6.0.14" - postcss-selector-parser "^3.1.1" + postcss "^7.0.14" + postcss-selector-parser "^5.0.0" postcss-normalize-charset@^4.0.1: version "4.0.1" @@ -5423,6 +5460,15 @@ postcss-selector-parser@^3.0.0, postcss-selector-parser@^3.1.1: indexes-of "^1.0.1" uniq "^1.0.1" +postcss-selector-parser@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c" + integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ== + dependencies: + cssesc "^2.0.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + postcss-selector-parser@^5.0.0-rc.4: version "5.0.0-rc.4" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0-rc.4.tgz#ca5e77238bf152966378c13e91ad6d611568ea87" @@ -5431,6 +5477,15 @@ postcss-selector-parser@^5.0.0-rc.4: indexes-of "^1.0.1" uniq "^1.0.1" +postcss-selector-parser@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" + integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== + dependencies: + cssesc "^3.0.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + postcss-svgo@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.1.tgz#5628cdb38f015de6b588ce6d0bf0724b492b581d" @@ -5461,7 +5516,7 @@ postcss@^5.0.8, postcss@^5.2.4: source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.14, postcss@^6.0.20, postcss@^6.0.23, postcss@^6.0.9: +postcss@^6.0.1, postcss@^6.0.20, postcss@^6.0.23, postcss@^6.0.9: version "6.0.23" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" dependencies: @@ -5477,6 +5532,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5: source-map "^0.6.1" supports-color "^5.5.0" +postcss@^7.0.11, postcss@^7.0.14: + version "7.0.14" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5" + integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -6503,6 +6567,13 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-co dependencies: has-flag "^3.0.0" +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + svgo@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.1.1.tgz#12384b03335bcecd85cfa5f4e3375fed671cb985" @@ -6546,23 +6617,23 @@ tailwindcss-skip-link@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tailwindcss-skip-link/-/tailwindcss-skip-link-1.0.1.tgz#b965624ed0b007ddd33f0326f2719d9a88b857c7" -tailwindcss@^0.7.2: - version "0.7.2" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-0.7.2.tgz#a81e0c532911ec665a749c03d821a17b49e30165" +"tailwindcss@https://github.com/tailwindcss/tailwindcss.git#next": + version "0.7.3" + resolved "https://github.com/tailwindcss/tailwindcss.git#483d9382929928a4cbc35a1df81d7847aa18ec7a" dependencies: - autoprefixer "^9.3.1" + autoprefixer "^9.4.5" bytes "^3.0.0" chalk "^2.4.1" - css.escape "^1.5.1" - fs-extra "^4.0.2" - lodash "^4.17.5" + fs-extra "^7.0.1" + lodash "^4.17.11" node-emoji "^1.8.1" + normalize.css "^8.0.1" perfectionist "^2.4.0" - postcss "^6.0.9" + postcss "^7.0.11" postcss-functions "^3.0.0" - postcss-js "^1.0.1" - postcss-nested "^3.0.0" - postcss-selector-parser "^3.1.1" + postcss-js "^2.0.0" + postcss-nested "^4.1.1" + postcss-selector-parser "^6.0.0" pretty-hrtime "^1.0.3" strip-comments "^1.0.2" From d420e47d20838791942d2fea3089f35d3442cdb2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 10 Mar 2019 00:15:05 +0000 Subject: [PATCH 02/13] Update configuration file --- tailwind.config.js | 38 ++++++++++++++++++++++++++++++++++++++ tailwind.js | 37 ------------------------------------- 2 files changed, 38 insertions(+), 37 deletions(-) create mode 100644 tailwind.config.js delete mode 100644 tailwind.js diff --git a/tailwind.config.js b/tailwind.config.js new file mode 100644 index 0000000..c87b2ec --- /dev/null +++ b/tailwind.config.js @@ -0,0 +1,38 @@ +module.exports = { + theme: { + colors: { + 'black': '#22292f', + 'black-60': 'rgba(0, 0, 0, .6)', + 'blue': '#3490dc', + 'blue-dark': '#2779bd', + 'blue-light': '#bcdefa', + 'green': '#77B159', + 'green-dark': '#325E1C', + 'green-light': '#CDE2C2', + 'green-lighter': '#F3FAEE', + 'grey': '#b8c2cc', + 'grey-dark': '#8795a1', + 'grey-darkest': '#3d4852', + 'grey-light': '#dae1e7', + 'grey-lighter': '#f0f0f0', + 'grey-lightest': '#F6F6F2', + 'transparent': 'transparent', + 'white': '#ffffff', + }, + extend: { + fontSize: { + '3xl': '1.75rem', + }, + maxWidth: { + '6xl': '80rem', + }, + }, + }, + plugins: [ + require('tailwindcss/plugins/container')({ + center: true, + padding: '1rem', + }), + require('tailwindcss-skip-link')(), + ] +} diff --git a/tailwind.js b/tailwind.js deleted file mode 100644 index 0246c99..0000000 --- a/tailwind.js +++ /dev/null @@ -1,37 +0,0 @@ -let defaultConfig = require('tailwindcss/defaultConfig')() - -var colors = { - ...defaultConfig.colors, - 'black': '#22292f', - 'black-60': 'rgba(0, 0, 0, .6)', - 'blue': '#3490dc', - 'blue-dark': '#2779bd', - 'blue-light': '#bcdefa', - 'green': '#77B159', - 'green-dark': '#325E1C', - 'green-light': '#CDE2C2', - 'green-lighter': '#F3FAEE', - 'grey': '#b8c2cc', - 'grey-dark': '#8795a1', - 'grey-darkest': '#3d4852', - 'grey-light': '#dae1e7', - 'grey-lighter': '#f0f0f0', - 'grey-lightest': '#F6F6F2', - 'transparent': 'transparent', - 'white': '#ffffff', -} - -module.exports = { - ...defaultConfig, - colors: colors, - textColors: colors, - backgroundColors: colors, - borderColors: Object.assign({ default: colors['grey-light'] }, colors), - plugins: [ - require('tailwindcss/plugins/container')({ - center: true, - padding: '1rem', - }), - require('tailwindcss-skip-link')(), - ], -} From ca39d8c659bcee17206fe9f6c2d20674462ab2c7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 10 Mar 2019 00:15:14 +0000 Subject: [PATCH 03/13] Rename preflight to base --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index b58d56a..5a49fa3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -20,7 +20,7 @@ export default {