1 files changed, 13 insertions, 49 deletions

diff --git a/app/assets/stylesheets/page_bundles/login.scss b/app/assets/stylesheets/page_bundles/login.scss
index 355d2afc0ba..b63f199f7b9 100644
--- a/app/assets/stylesheets/page_bundles/login.scss
+++ b/app/assets/stylesheets/page_bundles/login.scss
@@ -196,10 +196,6 @@
     }
   }
 
-  .submit-container {
-    margin-top: 16px;
-  }
-
   input[type='submit'] {
     margin-bottom: 0;
     display: block;
@@ -228,65 +224,33 @@
   }
 }
 
-.devise-layout-html {
+.html-devise-layout {
   margin: 0;
   padding: 0;
   height: 100%;
 
-  &.with-system-header {
-    .login-page-broadcast {
-      margin-top: calc(#{$system-header-height} + #{$header-height});
-    }
-  }
-
-  // Fixes footer container to bottom of viewport
   body {
-    // offset height of fixed header + 1 to avoid scroll
-    height: calc(100% - 51px);
+    padding-top: 48px; // Remove this line when the restyle_login_page feature flag is deleted. Instead, add self-align `center` to container, and maybe a top margin.
 
-    // offset without the header
-    &.navless {
-      height: calc(100% - 11px);
+    &.with-system-header {
+      padding-top: $system-header-height;
+      padding-top: calc(#{$system-header-height} + 48px); // Remove this line when the restyle_login_page feature flag is deleted
     }
 
-    margin: 0;
-    padding: 0;
-
-    .page-wrap {
-      min-height: 100%;
-      position: relative;
-    }
-
-    .footer-container,
-    hr.footer-fixed {
-      position: fixed;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      height: 40px;
-      background: var(--white, $white);
-    }
-
-    .login-page-broadcast {
-      margin-top: 40px;
-    }
-
-    .navless-container {
-      padding: 0 15px 65px; // height of footer + bottom padding of email confirmation link
-    }
-
-    .flash-container {
-      padding-bottom: 65px;
-
-      @include media-breakpoint-down(xs) {
-        padding-bottom: 0;
+    &.with-system-footer {
+      .footer-container {
+        padding-bottom: $system-footer-height;
       }
     }
   }
 }
 
 @include media-breakpoint-down(sm) {
-  .sm-bg-gray-10 {
+  .sm-bg-gray {
     @include gl-bg-gray-10;
+
+    .gl-dark & {
+      background-color: var(--gray-100);
+    }
   }
 }