diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-05 10:47:13 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-05 10:47:13 +0000 |
| commit | 214f38c4223091ce37d41582feacae09120db5d9 (patch) | |
| tree | e3b45a79cc50b47618bdb4ab5bfdfed28324876c | |
| parent | 1f78aeba40f76f6a2f6b44327367282838301a3f (diff) | |
| parent | 8d2996fe0e86c30035fa249f57d86f55dc7cbd97 (diff) | |
| download | gitlab-ce-214f38c4223091ce37d41582feacae09120db5d9.tar.gz | |
Merge branch 'fix-empty-navbar' into 'master'
Fix empty header margin
See merge request !769
| -rw-r--r-- | app/assets/stylesheets/generic/header.scss | 5 | ||||
| -rw-r--r-- | app/views/layouts/header/_empty.html.haml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/generic/header.scss b/app/assets/stylesheets/generic/header.scss index 71afccba001..3e738929a78 100644 --- a/app/assets/stylesheets/generic/header.scss +++ b/app/assets/stylesheets/generic/header.scss @@ -8,6 +8,11 @@ header { &.navbar-empty { background: #FFF; border-bottom: 1px solid #EEE; + + .center-logo { + margin: 8px 0; + text-align: center; + } } &.navbar-gitlab { diff --git a/app/views/layouts/header/_empty.html.haml b/app/views/layouts/header/_empty.html.haml index 16fbf6d4020..a52a3c8f0ef 100644 --- a/app/views/layouts/header/_empty.html.haml +++ b/app/views/layouts/header/_empty.html.haml @@ -1,4 +1,4 @@ %header.navbar.navbar-fixed-top.navbar-empty .container - %h4.center + .center-logo = image_tag 'logo-white.png', width: 32, height: 32 |