From 3cccd102ba543e02725d247893729e5c73b38295 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 20 Apr 2022 10:00:54 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-10-stable-ee

---
 app/assets/stylesheets/startup/startup-signin.scss | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'app/assets/stylesheets/startup/startup-signin.scss')

diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss
index 213d1c013a0..751ad26ca21 100644
--- a/app/assets/stylesheets/startup/startup-signin.scss
+++ b/app/assets/stylesheets/startup/startup-signin.scss
@@ -301,9 +301,12 @@ fieldset:disabled a.btn {
 .gl-form-input.form-control:disabled,
 .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;
+}
+.gl-form-input:disabled,
+.gl-form-input.form-control:disabled {
   cursor: not-allowed;
+  color: #868686;
 }
 .gl-form-input::placeholder,
 .gl-form-input.form-control::placeholder {
@@ -369,8 +372,7 @@ fieldset:disabled a.btn {
   outline: none;
   background-color: #0b5cad;
 }
-body,
-.form-control {
+body {
   font-size: 0.875rem;
 }
 [type="submit"] {
@@ -387,6 +389,12 @@ a {
 hr {
   overflow: hidden;
 }
+svg {
+  vertical-align: baseline;
+}
+.form-control {
+  font-size: 0.875rem;
+}
 .hidden {
   display: none !important;
   visibility: hidden !important;
@@ -394,9 +402,6 @@ hr {
 .hide {
   display: none;
 }
-svg {
-  vertical-align: baseline;
-}
 html {
   overflow-y: scroll;
 }
-- 
cgit v1.2.1