diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-07-25 11:07:26 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-07-25 11:07:26 +0000 |
| commit | b53d6e558127a43e40716213f14eda6d9efb1a01 (patch) | |
| tree | 9f09bb2e4294f4e5ef1e7ed92e00d8fe9bc8b147 | |
| parent | 5dd856f061ff9d9fdfe939f7f27687c17a2928cb (diff) | |
| parent | fee65beb70bb9f995fe701a9deb0fabdc7a0e142 (diff) | |
| download | gitlab-ce-b53d6e558127a43e40716213f14eda6d9efb1a01.tar.gz | |
Merge branch 'new-navigation-custom-logo' into 'master'
Fixed custom logo sizing in new navigation header
Closes #35439
See merge request !13034
| -rw-r--r-- | app/assets/stylesheets/new_nav.scss | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/new-navigation-custom-logo.yml | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss index 9f3e278ebfc..360ffda8d71 100644 --- a/app/assets/stylesheets/new_nav.scss +++ b/app/assets/stylesheets/new_nav.scss @@ -21,6 +21,11 @@ header.navbar-gitlab-new { padding-right: 0; color: currentColor; + img { + height: 28px; + margin-right: 10px; + } + > a { display: flex; align-items: center; diff --git a/changelogs/unreleased/new-navigation-custom-logo.yml b/changelogs/unreleased/new-navigation-custom-logo.yml new file mode 100644 index 00000000000..22e6c5dc7e5 --- /dev/null +++ b/changelogs/unreleased/new-navigation-custom-logo.yml @@ -0,0 +1,4 @@ +--- +title: Fix sizing of custom header logo in new navigation +merge_request: +author: |