diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss index 070ab36e0b372c95070e65c18a533092463743ed..cd0a10bd3a0d52f682f443934b5f299c78cdd2f4 100644 --- a/app/assets/stylesheets/startup/startup-signin.scss +++ b/app/assets/stylesheets/startup/startup-signin.scss @@ -315,9 +315,9 @@ fieldset:disabled a.btn { -moz-appearance: none; } .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:not(.form-control-plaintext):read-only { +.gl-form-input.form-control:not(.form-control-plaintext):not([type="color"]):read-only { background-color: #fafafa; color: #868686; box-shadow: inset 0 0 0 1px #dbdbdb; diff --git a/ee/app/assets/stylesheets/startup/startup-signin.scss b/ee/app/assets/stylesheets/startup/startup-signin.scss index 070ab36e0b372c95070e65c18a533092463743ed..cd0a10bd3a0d52f682f443934b5f299c78cdd2f4 100644 --- a/ee/app/assets/stylesheets/startup/startup-signin.scss +++ b/ee/app/assets/stylesheets/startup/startup-signin.scss @@ -315,9 +315,9 @@ fieldset:disabled a.btn { -moz-appearance: none; } .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:not(.form-control-plaintext):read-only { +.gl-form-input.form-control:not(.form-control-plaintext):not([type="color"]):read-only { background-color: #fafafa; color: #868686; box-shadow: inset 0 0 0 1px #dbdbdb; diff --git a/package.json b/package.json index d8cc2d554a7735a6b93ae24323ba47c10bf305dd..e67ae5a570bc4bb741bb5354805c69398d5f7ce8 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "@gitlab/favicon-overlay": "2.0.0", "@gitlab/svgs": "1.211.0", "@gitlab/tributejs": "1.0.0", - "@gitlab/ui": "32.2.1", + "@gitlab/ui": "32.2.3", "@gitlab/visual-review-tools": "1.6.1", "@rails/actioncable": "6.1.3-2", "@rails/ujs": "6.1.3-2", diff --git a/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap b/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap index f4f9cc288f959e8666a0de08f87e139df4b559fc..87eaabf4e986a29c3685ed30cbd7cc5f8c3c2ca5 100644 --- a/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap +++ b/spec/frontend/vue_shared/components/__snapshots__/memory_graph_spec.js.snap @@ -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" height="25" tooltiplabel="MB" - variant="gray900" /> </div> `; diff --git a/yarn.lock b/yarn.lock index 0ae3bbf32058010cd2111574353b01a08730ca7d..14270f6cca7cb4c39737f68696b435104ff50a8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -908,10 +908,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8" integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw== -"@gitlab/ui@32.2.1": - version "32.2.1" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.2.1.tgz#e019124af981e8ceffd39f30cf08d315c53d4ac8" - integrity sha512-19qe30gHtBG7g7wJy36bvS+ji1puJwVzAwqJOFXAh3axSa0Getyjyl9t5gmfwmZ2HehFTWLlThXppclnJVCEGA== +"@gitlab/ui@32.2.3": + version "32.2.3" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.2.3.tgz#1ac6169e370c21ec71ea3b18c5d077ab08e122b5" + integrity sha512-kT7XTawdXOzKkQeTjbzRawrpRLCeZj/xqQH6BECJ/IkporJle8CLR955HdvrS67lj8cYAOg4uOL7JjTYtltoPA== dependencies: "@babel/standalone" "^7.0.0" bootstrap-vue "2.18.1"