From 6b343d027928d3867b57d6ab99469c3e12f3a1f5 Mon Sep 17 00:00:00 2001 From: Kushal Pandya Date: Tue, 28 Nov 2017 10:49:55 +0530 Subject: [PATCH 1/2] Fix broadcast message not showing up on login page --- app/assets/stylesheets/pages/login.scss | 4 ++++ app/views/layouts/devise.html.haml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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" From 7954c1b3b610b751f843a7882fd0b9ca05840ab0 Mon Sep 17 00:00:00 2001 From: Kushal Pandya Date: Tue, 28 Nov 2017 10:50:15 +0530 Subject: [PATCH 2/2] Add changelog entry --- changelogs/unreleased/13634-broadcast-message.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/13634-broadcast-message.yml diff --git a/changelogs/unreleased/13634-broadcast-message.yml b/changelogs/unreleased/13634-broadcast-message.yml new file mode 100644 index 00000000000..26c4c133443 --- /dev/null +++ b/changelogs/unreleased/13634-broadcast-message.yml @@ -0,0 +1,5 @@ +--- +title: Fix broadcast message not showing up on login page +merge_request: 15578 +author: +type: fixed