From 4b21090b8dd7bef9e25a6a282e0a58079b0d81e6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 15 May 2020 19:21:53 +0000 Subject: [PATCH 1/3] Update dependency @gitlab/ui to v14 --- package.json | 2 +- yarn.lock | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 91b01f25..cb2b587b 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "main": "src/main.js", "dependencies": { "@gitlab/svgs": "1.127.0", - "@gitlab/ui": "12.3.0", + "@gitlab/ui": "14.11.1", "axios": "^0.19.2", "core-js": "^3.6.4", "document-register-element": "^1.14.3", diff --git a/yarn.lock b/yarn.lock index 2e35c94d..15507ae5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -830,10 +830,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.127.0.tgz#1f7ffdffe44d6a82b372535f93d78f3a895d1960" integrity sha512-Uv52DqkG2KwCB0VRlXUEHFZxJ/7Ql0t1YTdzICpXmDjltuUBrysFcdmWPVO6PgXQxk2ahryNsUjSOziMYTeSiw== -"@gitlab/ui@12.3.0": - version "12.3.0" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-12.3.0.tgz#9234205887675a6d13a51945ee62efc3c8b5e890" - integrity sha512-XrHC2pK7qlwy6K3OR/+iCP8TDewn3jaDIHCfHjt/KOwvD5LsEmam9RHjTiZ4epPZXLv4+JxCzbc4R+euEbIQ7g== +"@gitlab/ui@14.11.1": + version "14.11.1" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-14.11.1.tgz#b188915c1e1eb4a19186048fa095527b3a5fc820" + integrity sha512-bnrBTNFk3m3rsHP3+48Cgu8LlcUmkCfgh6tVbP7fWRDPN4sD8Ey33DPfinAWPFN9D5RolNqQSIVRJGoaxOVogw== dependencies: "@babel/standalone" "^7.0.0" "@gitlab/vue-toasted" "^1.3.0" @@ -846,8 +846,6 @@ portal-vue "^2.1.6" resize-observer-polyfill "^1.5.1" url-search-params-polyfill "^5.0.0" - vue "^2.6.10" - vue-loader "^15.4.2" vue-runtime-helpers "^1.1.2" "@gitlab/vue-toasted@^1.3.0": @@ -11338,7 +11336,7 @@ vue-jest@^3.0.5: tsconfig "^7.0.0" vue-template-es2015-compiler "^1.6.0" -vue-loader@^15.4.2, vue-loader@^15.8.3: +vue-loader@^15.8.3: version "15.9.0" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.0.tgz#5d4b0378a4606188fc83e587ed23c94bc3a10998" integrity sha512-FeDHvTSpwyLeF7LIV1PYkvqUQgTJ8UmOxhSlCyRSxaXCKk+M6NF4tDQsLsPPNeDPyR7TfRQ8MLg6v+8PsDV9xQ== @@ -11387,7 +11385,7 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== -vue@^2.6.10, vue@^2.6.11: +vue@^2.6.11: version "2.6.11" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ== -- GitLab From bf88a5fae26a2ab54e831aa98e655a1655cf6cff Mon Sep 17 00:00:00 2001 From: David O'Regan Date: Mon, 18 May 2020 10:15:07 +0100 Subject: [PATCH 2/3] fix(css): remove broken variable ref --- src/assets/styles/components/header.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/styles/components/header.scss b/src/assets/styles/components/header.scss index 32229b8d..9651cc53 100644 --- a/src/assets/styles/components/header.scss +++ b/src/assets/styles/components/header.scss @@ -3,7 +3,7 @@ color: $theme-indigo-200; &:hover { @include gl-rounded-base; - @include gl-text-white-light; + @include gl-text-white; background-color: rgba($theme-indigo-200, 0.2); } } -- GitLab From 17b31e85a9b3803f7c6b52a028f074f240fe9cc4 Mon Sep 17 00:00:00 2001 From: David O'Regan Date: Mon, 18 May 2020 10:21:25 +0100 Subject: [PATCH 3/3] fix(css): remove broken variable ref --- src/assets/styles/components/markdown.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/styles/components/markdown.scss b/src/assets/styles/components/markdown.scss index 24ac7376..d7739a46 100644 --- a/src/assets/styles/components/markdown.scss +++ b/src/assets/styles/components/markdown.scss @@ -207,7 +207,7 @@ $fa-font-path: '~font-awesome/fonts'; overflow-x: auto; tbody { - background-color: $white-light; + background-color: $white; td { border-color: $gray-200; -- GitLab