kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '13634-broadcast-message' into 'master'

Browse source 
Fix broadcast message not showing up on login page

Closes #13634

See merge request gitlab-org/gitlab-ce!15578
This commit is contained in:
Tim Zallmann 2017-11-30 14:24:29 +00:00
commit d77a0c7bba
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/pages/login.scss
View file

@ -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

1
app/views/layouts/devise.html.haml
View file

@ -4,6 +4,7 @@
%body.ui_charcoal.login-page.application.navless{ data: { page: body_data_page } }
.page-wrap
= render "layouts/header/empty"
.login-page-broadcast
= render "layouts/broadcast"
.container.navless-container
.content

5
changelogs/unreleased/13634-broadcast-message.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix broadcast message not showing up on login page
merge_request: 15578
author:
type: fixed