diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-11 16:50:25 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-29 15:35:49 +0100 |
| commit | 331722c03c8cf38b37e3b0df143c13e1d40d030c (patch) | |
| tree | 2eb4c3bc1004f7b081234c066efe6412fa628600 /app | |
| parent | 757c622c8005e52162e808faf9e066ce5399e59b (diff) | |
| download | gitlab-ce-331722c03c8cf38b37e3b0df143c13e1d40d030c.tar.gz | |
added logo ID to top bar
fixed flexbox not working in phantomjs
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/new_nav.scss | 3 | ||||
| -rw-r--r-- | app/views/layouts/header/_new.html.haml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss index 54fa4109f8b..0adef95e6e4 100644 --- a/app/assets/stylesheets/new_nav.scss +++ b/app/assets/stylesheets/new_nav.scss @@ -17,6 +17,7 @@ header.navbar-gitlab-new { } .title { + display: -webkit-flex; display: flex; padding-right: 0; color: currentColor; @@ -27,6 +28,7 @@ header.navbar-gitlab-new { } > a { + display: -webkit-flex; display: flex; align-items: center; padding-right: $gl-padding; @@ -177,6 +179,7 @@ header.navbar-gitlab-new { } .navbar-sub-nav { + display: -webkit-flex; display: flex; margin-bottom: 0; color: $indigo-200; diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml index c6779d2de31..4538920ef3d 100644 --- a/app/views/layouts/header/_new.html.haml +++ b/app/views/layouts/header/_new.html.haml @@ -4,7 +4,7 @@ .header-content .title-container %h1.title - = link_to root_path, title: 'Dashboard' do + = link_to root_path, title: 'Dashboard', id: 'logo' do = brand_header_logo %span.logo-text.hidden-xs = render 'shared/logo_type.svg' |