summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushal@gitlab.com>2017-11-28 10:49:55 +0530
committerKushal Pandya <kushal@gitlab.com>2017-11-28 10:49:55 +0530
commit6b343d027928d3867b57d6ab99469c3e12f3a1f5 (patch)
treef21f5fa6d06473965fdebcb8dad73c4861307a82
parent25a3a1838ab3224be0b6c658ea16fd1b37135372 (diff)
downloadgitlab-ce-6b343d027928d3867b57d6ab99469c3e12f3a1f5.tar.gz
Fix broadcast message not showing up on login page
-rw-r--r--app/assets/stylesheets/pages/login.scss4
-rw-r--r--app/views/layouts/devise.html.haml3
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss
index b7985c4dea5..b2250a1ce2f 100644
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -252,6 +252,10 @@
background: $white-light;
}
+ .login-page-broadcast {
+ margin-top: 50px;
+ }
+
.navless-container {
padding: 65px 15px; // height of footer + bottom padding of email confirmation link
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 52fb46eb8c9..97016d28535 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -4,7 +4,8 @@
%body.ui_charcoal.login-page.application.navless{ data: { page: body_data_page } }
.page-wrap
= render "layouts/header/empty"
- = render "layouts/broadcast"
+ .login-page-broadcast
+ = render "layouts/broadcast"
.container.navless-container
.content
= render "layouts/flash"