From ebe3375897eae9787c10470c2c822fbe47827353 Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Sat, 17 Oct 2020 14:25:44 -0600 Subject: [PATCH 1/2] Fix white highlight hiding console text (fixes #2541) --- resources/scripts/components/server/Console.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/scripts/components/server/Console.tsx b/resources/scripts/components/server/Console.tsx index e3720ab69..1cc919e17 100644 --- a/resources/scripts/components/server/Console.tsx +++ b/resources/scripts/components/server/Console.tsx @@ -11,9 +11,11 @@ import tw from 'twin.macro'; import 'xterm/css/xterm.css'; import useEventListener from '@/plugins/useEventListener'; import { debounce } from 'debounce'; +// @ts-ignore +import tailwindConfig from '../../../../tailwind.config.js'; const theme = { - background: 'transparent', + background: tailwindConfig.theme.colors.black, cursor: 'transparent', black: '#000000', red: '#E54B4B', From 820d8f75605d699da9fea4ed88d4b9a079d9d4a1 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 17 Oct 2020 13:43:22 -0700 Subject: [PATCH 2/2] Better logic for using theme values --- package.json | 4 +- .../scripts/components/server/Console.tsx | 8 ++-- yarn.lock | 44 +++++++++++++------ 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index f7c7b8b81..29caf1f17 100644 --- a/package.json +++ b/package.json @@ -93,9 +93,9 @@ "source-map-loader": "^1.0.1", "style-loader": "^1.2.1", "svg-url-loader": "^6.0.0", - "tailwindcss": "^1.4.6", + "tailwindcss": "^1.9.4", "terser-webpack-plugin": "^3.0.6", - "twin.macro": "^1.4.1", + "twin.macro": "^1.10.0", "typescript": "^3.9.6", "typescript-plugin-tw-template": "^2.0.1", "webpack": "^4.43.0", diff --git a/resources/scripts/components/server/Console.tsx b/resources/scripts/components/server/Console.tsx index 1cc919e17..f7ab5d4f9 100644 --- a/resources/scripts/components/server/Console.tsx +++ b/resources/scripts/components/server/Console.tsx @@ -7,17 +7,15 @@ import SpinnerOverlay from '@/components/elements/SpinnerOverlay'; import { ServerContext } from '@/state/server'; import styled from 'styled-components/macro'; import { usePermissions } from '@/plugins/usePermissions'; -import tw from 'twin.macro'; +import tw, { theme } from 'twin.macro'; import 'xterm/css/xterm.css'; import useEventListener from '@/plugins/useEventListener'; import { debounce } from 'debounce'; -// @ts-ignore -import tailwindConfig from '../../../../tailwind.config.js'; const theme = { - background: tailwindConfig.theme.colors.black, + background: theme`colors.black`, cursor: 'transparent', - black: '#000000', + black: theme`colors.black`, red: '#E54B4B', green: '#9ECE58', yellow: '#FAED70', diff --git a/yarn.lock b/yarn.lock index d25cfe4f8..897bad166 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2174,7 +2174,7 @@ chalk@^2.0, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0: +"chalk@^3.0.0 || ^4.0.0", chalk@^4.0.0, chalk@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== @@ -3937,6 +3937,11 @@ html-parse-stringify2@2.0.1: dependencies: void-elements "^2.0.1" +html-tags@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== + http-deceiver@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" @@ -4610,7 +4615,7 @@ lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" -lodash@^4.17.19: +lodash@^4.17.19, lodash@^4.17.20: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -5119,6 +5124,11 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" +object-hash@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea" + integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg== + object-inspect@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" @@ -5581,6 +5591,11 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9" +postcss-value-parser@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== + postcss@7.0.32, postcss@^7.0.27: version "7.0.32" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" @@ -6840,27 +6855,30 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tailwindcss@^1.4.4, tailwindcss@^1.4.6: - version "1.4.6" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.4.6.tgz#17b37166ccda08d7e7f9ca995ea48ce1e0089700" - integrity sha512-qV0qInUq1FWih39Bc5CWECdgObSzRrbjGD4ke4kAPSIq6WXrPhv0wwOcUWJgJ66ltT9j+XnSRYikG8WNRU/fTQ== +tailwindcss@^1.8.8, tailwindcss@^1.9.4: + version "1.9.4" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.9.4.tgz#5ae8ff84bc8234df22ba5f2c7feafb64bb14da55" + integrity sha512-CVeP4J1pDluBM/AF11JPku9Cx+VwQ6MbOcnlobnWVVZnq+xku8sa+XXmYzy/GvE08qD8w+OmpSdN21ZFPoVDRg== dependencies: "@fullhuman/postcss-purgecss" "^2.1.2" autoprefixer "^9.4.5" browserslist "^4.12.0" bytes "^3.0.0" - chalk "^4.0.0" + chalk "^3.0.0 || ^4.0.0" color "^3.1.2" detective "^5.2.0" fs-extra "^8.0.0" - lodash "^4.17.15" + html-tags "^3.1.0" + lodash "^4.17.20" node-emoji "^1.8.1" normalize.css "^8.0.1" + object-hash "^2.0.3" postcss "^7.0.11" postcss-functions "^3.0.0" postcss-js "^2.0.0" postcss-nested "^4.1.1" postcss-selector-parser "^6.0.0" + postcss-value-parser "^4.1.0" pretty-hrtime "^1.0.3" reduce-css-calc "^2.1.6" resolve "^1.14.2" @@ -7063,10 +7081,10 @@ tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" -twin.macro@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/twin.macro/-/twin.macro-1.4.1.tgz#48de95e52c34d068486610889a68d44c766bac1a" - integrity sha512-/hUXvyQepce26FvgfZmMl7IEgwxKy57te99FuECxeRUVjrX31A1F27lt+SSrtFNivoCN4Dk7FimUx5jqjth2jQ== +twin.macro@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/twin.macro/-/twin.macro-1.10.0.tgz#b13d0934457d4cae54f1504a3a2ed744ed603960" + integrity sha512-+K9xvBvlx7iQ+CRatqNO/3VVV2+D+rbxexViKFtkjlICd+7A9hp5/8IOQ3SUPTQp80Ouist3Zcs/89quSLaoZg== dependencies: "@babel/parser" "^7.10.2" babel-plugin-macros "^2.8.0" @@ -7077,7 +7095,7 @@ twin.macro@^1.4.1: dset "^2.0.1" lodash.merge "^4.6.2" string-similarity "^4.0.1" - tailwindcss "^1.4.4" + tailwindcss "^1.8.8" timsort "^0.3.0" type-check@^0.4.0, type-check@~0.4.0: