Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 13 insertions, 10 deletions

diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss
index 3ed257caf60..c5cbe58ec27 100644
--- a/app/assets/stylesheets/startup/startup-signin.scss
+++ b/app/assets/stylesheets/startup/startup-signin.scss
@@ -138,10 +138,10 @@ hr {
   margin-right: -15px;
   margin-left: -15px;
 }
-.col,
-.col-sm-5,
+.col-sm-12,
 .col-sm-7,
-.col-sm-12 {
+.col-sm-5,
+.col {
   position: relative;
   width: 100%;
   padding-right: 15px;
@@ -160,12 +160,12 @@ hr {
 }
 @media (min-width: 576px) {
   .col-sm-5 {
-    flex: 0 0 41.66667%;
-    max-width: 41.66667%;
+    flex: 0 0 41.6666666667%;
+    max-width: 41.6666666667%;
   }
   .col-sm-7 {
-    flex: 0 0 58.33333%;
-    max-width: 58.33333%;
+    flex: 0 0 58.3333333333%;
+    max-width: 58.3333333333%;
   }
   .col-sm-12 {
     flex: 0 0 100%;
@@ -725,11 +725,14 @@ svg {
   margin-top: 40px;
 }
 .devise-layout-html body .navless-container {
-  padding: 65px 15px;
+  padding: 0 15px 65px;
+}
+.devise-layout-html body .flash-container {
+  padding-bottom: 65px;
 }
 @media (max-width: 575.98px) {
-  .devise-layout-html body .navless-container {
-    padding: 0 15px 65px;
+  .devise-layout-html body .flash-container {
+    padding-bottom: 0;
   }
 }