Commit 4e503205 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'jnnkl-gitlab-ui-32.2.3' into 'master'

Update GitLabUI to 32.2.3

See merge request gitlab-org/gitlab!68651
parents f01c794d f1f4b41f
...@@ -315,9 +315,9 @@ fieldset:disabled a.btn { ...@@ -315,9 +315,9 @@ fieldset:disabled a.btn {
-moz-appearance: none; -moz-appearance: none;
} }
.gl-form-input:disabled, .gl-form-input:disabled,
.gl-form-input:not(.form-control-plaintext):read-only, .gl-form-input:not(.form-control-plaintext):not([type="color"]):read-only,
.gl-form-input.form-control:disabled, .gl-form-input.form-control:disabled,
.gl-form-input.form-control:not(.form-control-plaintext):read-only { .gl-form-input.form-control:not(.form-control-plaintext):not([type="color"]):read-only {
background-color: #fafafa; background-color: #fafafa;
color: #868686; color: #868686;
box-shadow: inset 0 0 0 1px #dbdbdb; box-shadow: inset 0 0 0 1px #dbdbdb;
......
...@@ -315,9 +315,9 @@ fieldset:disabled a.btn { ...@@ -315,9 +315,9 @@ fieldset:disabled a.btn {
-moz-appearance: none; -moz-appearance: none;
} }
.gl-form-input:disabled, .gl-form-input:disabled,
.gl-form-input:not(.form-control-plaintext):read-only, .gl-form-input:not(.form-control-plaintext):not([type="color"]):read-only,
.gl-form-input.form-control:disabled, .gl-form-input.form-control:disabled,
.gl-form-input.form-control:not(.form-control-plaintext):read-only { .gl-form-input.form-control:not(.form-control-plaintext):not([type="color"]):read-only {
background-color: #fafafa; background-color: #fafafa;
color: #868686; color: #868686;
box-shadow: inset 0 0 0 1px #dbdbdb; box-shadow: inset 0 0 0 1px #dbdbdb;
......
...@@ -9,7 +9,6 @@ exports[`MemoryGraph Render chart should draw container with chart 1`] = ` ...@@ -9,7 +9,6 @@ exports[`MemoryGraph Render chart should draw container with chart 1`] = `
data="Nov 12 2019 19:17:33,2.87,Nov 12 2019 19:18:33,2.78,Nov 12 2019 19:19:33,2.78,Nov 12 2019 19:20:33,3.01" data="Nov 12 2019 19:17:33,2.87,Nov 12 2019 19:18:33,2.78,Nov 12 2019 19:19:33,2.78,Nov 12 2019 19:20:33,3.01"
height="25" height="25"
tooltiplabel="MB" tooltiplabel="MB"
variant="gray900"
/> />
</div> </div>
`; `;
...@@ -1233,10 +1233,10 @@ ...@@ -1233,10 +1233,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8" resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw== integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
"@gitlab/ui@32.2.1": "@gitlab/ui@32.2.3":
version "32.2.1" version "32.2.3"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.2.1.tgz#e019124af981e8ceffd39f30cf08d315c53d4ac8" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.2.3.tgz#1ac6169e370c21ec71ea3b18c5d077ab08e122b5"
integrity sha512-19qe30gHtBG7g7wJy36bvS+ji1puJwVzAwqJOFXAh3axSa0Getyjyl9t5gmfwmZ2HehFTWLlThXppclnJVCEGA== integrity sha512-kT7XTawdXOzKkQeTjbzRawrpRLCeZj/xqQH6BECJ/IkporJle8CLR955HdvrS67lj8cYAOg4uOL7JjTYtltoPA==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
bootstrap-vue "2.18.1" bootstrap-vue "2.18.1"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment