diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-30 14:24:29 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-30 14:24:29 +0000 |
| commit | d77a0c7bba3ae163bab8cb9880d6b776cd3354be (patch) | |
| tree | 03e3af99cf4d552eb02a7cc7fe370801229d3fb1 | |
| parent | 4be8b9d1028fc54abe9e1ca28d041dd7a7e99b88 (diff) | |
| parent | 7954c1b3b610b751f843a7882fd0b9ca05840ab0 (diff) | |
| download | gitlab-ce-d77a0c7bba3ae163bab8cb9880d6b776cd3354be.tar.gz | |
Merge branch '13634-broadcast-message' into 'master'
Fix broadcast message not showing up on login page
Closes #13634
See merge request gitlab-org/gitlab-ce!15578
| -rw-r--r-- | app/assets/stylesheets/pages/login.scss | 4 | ||||
| -rw-r--r-- | app/views/layouts/devise.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/13634-broadcast-message.yml | 5 |
3 files changed, 11 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" 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 |