From 2c7a1af66f45e475b5aa7b8b91e7f8c85134a762 Mon Sep 17 00:00:00 2001
From: Bryce Johnson <bryce@gitlab.com>
Date: Fri, 23 Sep 2016 13:38:39 +0200
Subject: [PATCH] Add submit button contain with custom margin.
---
app/assets/stylesheets/pages/login.scss | 4 ++++
app/views/devise/sessions/_new_base.html.haml | 2 +-
app/views/devise/shared/_signup_box.html.haml | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss
index f680fd68d70..b235eb845b0 100644
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -198,6 +198,10 @@
font-weight: normal;
}
+ .submit-container {
+ margin-top: 16px;
+ }
+
input[type="submit"] {
@extend .btn-block;
margin-bottom: 0px;
diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml
index d0cd418236a..a96b579c593 100644
--- a/app/views/devise/sessions/_new_base.html.haml
+++ b/app/views/devise/sessions/_new_base.html.haml
@@ -12,5 +12,5 @@
%span Remember me
.pull-right
= link_to "Forgot your password?", new_password_path(resource_name)
- %div.prepend-top-20
+ %div.submit-container
= f.submit "Sign in", class: "btn btn-save"
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml
index fb7ee2dbd3b..d0bbcf3115e 100644
--- a/app/views/devise/shared/_signup_box.html.haml
+++ b/app/views/devise/shared/_signup_box.html.haml
@@ -24,7 +24,7 @@
= recaptcha_tags
%div
= f.submit "Register", class: "btn-register btn"
-.clearfix.prepend-top-20
+.clearfix.submit-container
%p
%span.light Didn't receive a confirmation email?
= succeed '.' do
--
GitLab