From f006724abcd12fec2ff066c4b9c8fdee8fbcc744 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 21 Mar 2019 00:29:08 +0000 Subject: [PATCH 01/14] Update colour scale --- tailwind.config.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tailwind.config.js b/tailwind.config.js index 9413b4f..b071d66 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -6,24 +6,24 @@ module.exports = { inherit: 'inherit', black: '#22292f', blue: { - 1: '#29aae1', - 2: '#018dc7', - 3: '#0e68a7', - 4: '#004f86', + 100: '#29aae1', + 200: '#018dc7', + 300: '#0e68a7', + 400: '#004f86', }, green: '#398002', grey: { - 1: '#f8fafc', - 2: '#eee', - 3: '#ddd', - 4: '#bbb', - 5: '#888', - 6: '#555', - 7: '#333', + 100: '#f8fafc', + 200: '#eee', + 300: '#ddd', + 400: '#bbb', + 500: '#888', + 600: '#555', + 700: '#333', }, orange: { - 1: '#fa9903', - 2: '#ffb401', + 100: '#fa9903', + 200: '#ffb401', }, purple: '#991faf', red: '#cc1f1a', From 505c4634c3d7a3c50b71fabd9a42c014a18870a1 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 21 Mar 2019 00:30:35 +0000 Subject: [PATCH 02/14] defaultConfig is no longer a function --- tailwind.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailwind.config.js b/tailwind.config.js index b071d66..b3162d8 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,4 +1,4 @@ -defaultTheme = require('tailwindcss/defaultTheme')() +defaultTheme = require('tailwindcss/defaultTheme') module.exports = { theme: { From 46034c8a39853b7688b1b26937df12f3ed8a9b5d Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 21 Mar 2019 00:31:31 +0000 Subject: [PATCH 03/14] Container is now a core plugin --- tailwind.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/tailwind.config.js b/tailwind.config.js index b3162d8..5b3fb49 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -59,7 +59,6 @@ module.exports = { }, }, plugins: [ - require('tailwindcss/plugins/container')(), require('tailwindcss-spaced-items')({ values: defaultTheme.spacing }), require('tailwindcss-visuallyhidden')(), ], From eb9da4a8e0a6e1c640e2a48b29f9d881f4fcd269 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 21 Mar 2019 00:33:44 +0000 Subject: [PATCH 04/14] Switch to Tailwind beta --- package.json | 2 +- yarn.lock | 56 +++++----------------------------------------------- 2 files changed, 6 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index 742b11f..9138070 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "postcss-nested": "^4.1.2", - "tailwindcss": "https://github.com/tailwindcss/tailwindcss.git#next", + "tailwindcss": "^1.0.0-beta.3", "tailwindcss-spaced-items": "^0.1.0", "tailwindcss-visuallyhidden": "^1.0.1", "vue": "^2.5.17", diff --git a/yarn.lock b/yarn.lock index ba1f3ab..385c526 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1339,13 +1339,6 @@ babel-eslint@^10.0.1: eslint-scope "3.7.1" eslint-visitor-keys "^1.0.0" -babel-extract-comments@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz#0a2aedf81417ed391b85e18b4614e693a0351a21" - integrity sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ== - dependencies: - babylon "^6.18.0" - babel-helper-vue-jsx-merge-props@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6" @@ -1368,19 +1361,6 @@ babel-plugin-dynamic-import-node@^2.2.0: dependencies: object.assign "^4.1.0" -babel-plugin-syntax-object-rest-spread@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" - integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U= - -babel-plugin-transform-object-rest-spread@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" - integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY= - dependencies: - babel-plugin-syntax-object-rest-spread "^6.8.0" - babel-runtime "^6.26.0" - babel-plugin-transform-vue-jsx@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-4.0.1.tgz#2c8bddce87a6ef09eaa59869ff1bfbeeafc5f88d" @@ -1388,19 +1368,6 @@ babel-plugin-transform-vue-jsx@^4.0.1: dependencies: esutils "^2.0.2" -babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -2170,7 +2137,7 @@ copy-webpack-plugin@^4.6.0: p-limit "^1.0.0" serialize-javascript "^1.4.0" -core-js@^2.4.0, core-js@^2.5.7, core-js@^2.6.1: +core-js@^2.5.7, core-js@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042" integrity sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg== @@ -6369,11 +6336,6 @@ regenerate@^1.2.1, regenerate@^1.4.0: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - regenerator-runtime@^0.12.0: version "0.12.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de" @@ -7190,14 +7152,6 @@ strip-ansi@^5.0.0: dependencies: ansi-regex "^4.0.0" -strip-comments@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-1.0.2.tgz#82b9c45e7f05873bee53f37168af930aa368679d" - integrity sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw== - dependencies: - babel-extract-comments "^1.0.0" - babel-plugin-transform-object-rest-spread "^6.26.0" - strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -7300,9 +7254,10 @@ tailwindcss-visuallyhidden@^1.0.1: resolved "https://registry.yarnpkg.com/tailwindcss-visuallyhidden/-/tailwindcss-visuallyhidden-1.0.1.tgz#ed67ecf6ee48ea0313b5c3c27498467f350be206" integrity sha512-RJNJ2BqUBPw8OgPR/UnoLFNuKuFWEM5gk6tcg63atG5rUS5tTtxHjsay0b8JnIx+0xfFF72dRuoDmVvxn4HDrg== -"tailwindcss@https://github.com/tailwindcss/tailwindcss.git#next": - version "0.7.3" - resolved "https://github.com/tailwindcss/tailwindcss.git#483d9382929928a4cbc35a1df81d7847aa18ec7a" +tailwindcss@^1.0.0-beta.3: + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.0.0-beta.3.tgz#66ac8e15377f4038cea6877e834a54edbc5ca295" + integrity sha512-J3KZ0gtpz1XVQ/D2xTuBMII1KmEb9LrQibIWtFRAXpa81yIeDM3v1g88M3Qr/lnjrJymi7zC3T2f9AdGuZ4oMw== dependencies: autoprefixer "^9.4.5" bytes "^3.0.0" @@ -7318,7 +7273,6 @@ tailwindcss-visuallyhidden@^1.0.1: postcss-nested "^4.1.1" postcss-selector-parser "^6.0.0" pretty-hrtime "^1.0.3" - strip-comments "^1.0.2" tapable@^1.0.0, tapable@^1.1.0: version "1.1.1" From 5323b6153f283aadee589e137c9471c8c377d5c3 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 21 Mar 2019 00:42:57 +0000 Subject: [PATCH 05/14] Update colour class names --- public/index.html | 2 +- src/App.vue | 12 ++-- .../Application/ApplicationCard.vue | 12 ++-- .../ApplicationDisplaySwitcher.vue | 6 +- src/components/Application/StarToggle.vue | 2 +- src/components/Environment/ActionCards.vue | 58 +++++++++---------- .../Environment/EnvironmentCards.vue | 18 +++--- src/components/Environment/QuickHelp.vue | 8 +-- .../Environment/TaskLog/TaskLog.vue | 2 +- .../Environment/TaskLog/TaskLogItem.vue | 12 ++-- src/components/Environment/ToggleHelp.vue | 4 +- src/components/HeaderButtons.vue | 4 +- src/components/Navbar.vue | 10 ++-- src/components/Sidebar.vue | 10 ++-- src/components/TitleBlock.vue | 4 +- src/views/Applications.vue | 2 +- src/views/Environment.vue | 26 ++++----- src/views/Environments.vue | 8 +-- 18 files changed, 100 insertions(+), 100 deletions(-) diff --git a/public/index.html b/public/index.html index db7b8f7..1f3f4fb 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ Rebuilding Acquia - + diff --git a/src/App.vue b/src/App.vue index 361232b..c1ed107 100644 --- a/src/App.vue +++ b/src/App.vue @@ -18,29 +18,29 @@ h2 { } .btn { - @apply text-sm font-thin antialiased text-white px-4 py-3 no-underline rounded mx-1 bg-blue-3; + @apply text-sm font-thin antialiased text-white px-4 py-3 no-underline rounded mx-1 bg-blue-300; &:hover, &:focus { - @apply bg-blue-4 + @apply bg-blue-400 } } .btn.is-secondary { - @apply bg-grey-5; + @apply bg-grey-500; &:hover, &:focus { - @apply bg-grey-6 + @apply bg-grey-600 } } .tag { - @apply text-2xs uppercase py-1 px-2 rounded border border-grey-4 bg-white mr-2 mb-2 + @apply text-2xs uppercase py-1 px-2 rounded border border-grey-400 bg-white mr-2 mb-2 } .tag.is-type { - @apply bg-blue-1 border-blue-1 text-white + @apply bg-blue-100 border-blue-100 text-white } @tailwind utilities; diff --git a/src/components/Application/ApplicationCard.vue b/src/components/Application/ApplicationCard.vue index 8e5e41b..c856cef 100644 --- a/src/components/Application/ApplicationCard.vue +++ b/src/components/Application/ApplicationCard.vue @@ -1,14 +1,14 @@