summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Gray <annabel.m.gray@gmail.com>2018-07-25 18:14:23 +0000
committerAnnabel Gray <annabel.m.gray@gmail.com>2018-07-25 18:14:23 +0000
commit0fd8b7da26c8736a7e345f214209d5074eec93a6 (patch)
treee30b1a7722e93cd61218c9b4f7ec791cc61a9e18
parent65d7ea10436e5c1ed3605cbcc4584cee2b0244c3 (diff)
parentbc967dd24ade3a062ae202917dadb28348ba7276 (diff)
downloadgitlab-ce-0fd8b7da26c8736a7e345f214209d5074eec93a6.tar.gz
Merge branch '49364-fix-broadcast-margin' into 'master'
Resolve "Broadcast message is misaligned on sign in page" Closes #49364 See merge request gitlab-org/gitlab-ce!20794
-rw-r--r--app/assets/stylesheets/pages/login.scss2
-rw-r--r--changelogs/unreleased/49364-fix-broadcast-margin.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss
index c1b1d2e028d..8a4a2caa6c9 100644
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -237,7 +237,7 @@
}
.login-page-broadcast {
- margin-top: 50px;
+ margin-top: 40px;
}
.navless-container {
diff --git a/changelogs/unreleased/49364-fix-broadcast-margin.yml b/changelogs/unreleased/49364-fix-broadcast-margin.yml
new file mode 100644
index 00000000000..821fb9df1af
--- /dev/null
+++ b/changelogs/unreleased/49364-fix-broadcast-margin.yml
@@ -0,0 +1,5 @@
+---
+title: Fix misalignment of broadcast message on login page
+merge_request: 20794
+author: Robin Naundorf
+type: fixed