diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-12 20:42:21 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-12 20:42:21 +0000 |
| commit | a52d8c101d86bb308cbb4a727dff0ecb37ff382f (patch) | |
| tree | 5c07a7d60ab2d204937a5a7529a310d1ece38599 | |
| parent | 9978602d522df1e959bec153b56d818829875fdc (diff) | |
| parent | 3c6d95a6d3583f57bece4586f077e4d5f5b3ec4f (diff) | |
| download | gitlab-ce-a52d8c101d86bb308cbb4a727dff0ecb37ff382f.tar.gz | |
Merge branch 'fix_gitlab-ce#41891' into 'master'
fix gitlab-org/gitlab-ce#41891 (design nitpick)
Closes #41891
See merge request gitlab-org/gitlab-ce!16383
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 5 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/fix_gitlab-ce-41891.yml | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index ad160f37641..3b7256f3000 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -104,7 +104,10 @@ img { height: 28px; - margin-right: 8px; + + + .logo-text { + margin-left: 8px; + } } &.wrap { diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 46727811be4..e7fc83a8d04 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -6,8 +6,10 @@ %h1.title = link_to root_path, title: 'Dashboard', id: 'logo' do = brand_header_logo - %span.logo-text.hidden-xs - = brand_header_logo_type + - logo_text = brand_header_logo_type + - if logo_text.present? + %span.logo-text.hidden-xs + = logo_text - if current_user = render "layouts/nav/dashboard" diff --git a/changelogs/unreleased/fix_gitlab-ce-41891.yml b/changelogs/unreleased/fix_gitlab-ce-41891.yml new file mode 100644 index 00000000000..56bdc1a7c32 --- /dev/null +++ b/changelogs/unreleased/fix_gitlab-ce-41891.yml @@ -0,0 +1,5 @@ +--- +title: 'Fix custom header logo design nitpick: Remove unneeded margin on empty logo text' +merge_request: 16383 +author: Markus Doits +type: fixed |