Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 3 insertions, 3 deletions

diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss
index 020ed9c040b..3090edfb123 100644
--- a/app/assets/stylesheets/startup/startup-signin.scss
+++ b/app/assets/stylesheets/startup/startup-signin.scss
@@ -297,7 +297,7 @@ fieldset:disabled a.btn {
 .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):not([type="color"]):read-only {
-  background-color: #fafafa;
+  background-color: #f5f5f5;
   box-shadow: inset 0 0 0 1px #dbdbdb;
 }
 .gl-form-input:disabled,
@@ -419,7 +419,7 @@ body.navless {
   }
 }
 .navless-container {
-  margin-top: var(--header-height, 40px);
+  margin-top: var(--header-height, 48px);
   padding-top: 32px;
 }
 .btn {
@@ -506,7 +506,7 @@ label.label-bold {
 }
 .navbar-empty {
   justify-content: center;
-  height: var(--header-height, 40px);
+  height: var(--header-height, 48px);
   background: #fff;
   border-bottom: 1px solid #dbdbdb;
 }