6 files changed, 11 insertions, 13 deletions

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 9cebd4f49a4..d349bf7a1d3 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -261,7 +261,7 @@
 .btn-block {
   width: 100%;
   margin: 0;
-  margin-bottom: 15px;
+  @include gl-mb-5;
 
   &.btn {
     padding: 6px 0;
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss
index 4a3ec5992a5..7f0bdadd2bc 100644
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -45,7 +45,6 @@
   .omniauth-container {
     box-shadow: 0 0 0 1px $border-color;
     border-radius: $border-radius;
-    padding: 15px;
 
     .login-heading h3 {
       font-weight: $gl-font-weight-normal;
diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss
index 0683123c778..87921051f1d 100644
--- a/app/assets/stylesheets/startup/startup-dark.scss
+++ b/app/assets/stylesheets/startup/startup-dark.scss
@@ -1865,6 +1865,7 @@ body.gl-dark
 }
 body.gl-dark .header-search {
   background-color: rgba(250, 250, 250, 0.2) !important;
+  border-radius: 4px;
 }
 body.gl-dark .header-search svg.gl-search-box-by-type-search-icon {
   color: rgba(250, 250, 250, 0.8);
diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss
index de6b8e6e672..fe840f50f1e 100644
--- a/app/assets/stylesheets/startup/startup-signin.scss
+++ b/app/assets/stylesheets/startup/startup-signin.scss
@@ -138,9 +138,8 @@ hr {
   margin-right: -15px;
   margin-left: -15px;
 }
+.col-md-6,
 .col-sm-12,
-.col-sm-7,
-.col-sm-5,
 .col {
   position: relative;
   width: 100%;
@@ -159,14 +158,6 @@ hr {
   order: 12;
 }
 @media (min-width: 576px) {
-  .col-sm-5 {
-    flex: 0 0 41.6666666667%;
-    max-width: 41.6666666667%;
-  }
-  .col-sm-7 {
-    flex: 0 0 58.3333333333%;
-    max-width: 58.3333333333%;
-  }
   .col-sm-12 {
     flex: 0 0 100%;
     max-width: 100%;
@@ -178,6 +169,12 @@ hr {
     order: 12;
   }
 }
+@media (min-width: 768px) {
+  .col-md-6 {
+    flex: 0 0 50%;
+    max-width: 50%;
+  }
+}
 .form-control {
   display: block;
   width: 100%;
@@ -578,7 +575,6 @@ svg {
 .login-page .omniauth-container {
   box-shadow: 0 0 0 1px #dbdbdb;
   border-radius: 0.25rem;
-  padding: 15px;
 }
 .login-page .login-box .login-heading h3,
 .login-page .omniauth-container .login-heading h3 {
diff --git a/app/assets/stylesheets/themes/theme_helper.scss b/app/assets/stylesheets/themes/theme_helper.scss
index 07194e2b532..234010074aa 100644
--- a/app/assets/stylesheets/themes/theme_helper.scss
+++ b/app/assets/stylesheets/themes/theme_helper.scss
@@ -150,6 +150,7 @@
 
   .header-search {
     background-color: rgba($search-and-nav-links, 0.2) !important;
+    border-radius: $border-radius-default;
 
     &:hover {
       background-color: rgba($search-and-nav-links, 0.3) !important;
diff --git a/app/assets/stylesheets/themes/theme_light.scss b/app/assets/stylesheets/themes/theme_light.scss
index 10e03fb885c..66b2b3c3437 100644
--- a/app/assets/stylesheets/themes/theme_light.scss
+++ b/app/assets/stylesheets/themes/theme_light.scss
@@ -48,6 +48,7 @@ body {
     .header-search {
       background-color: $white !important;
       box-shadow: inset 0 0 0 1px $border-color !important;
+      border-radius: $border-radius-default;
 
       &:hover {
         background-color: $white !important;