diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-27 10:55:23 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-27 10:55:23 +0000 |
| commit | b46ac16cc89d649bf5fba9a36f1911a575b41e1f (patch) | |
| tree | eaf5df2f3ee50279226ed30cf65fec4e37915b62 /app/views/layouts | |
| parent | 86e2b07ab247655758b6927c27743782c77d93e0 (diff) | |
| parent | 004f3a0bc2e3c85518a2a95db68945b47acc14c7 (diff) | |
| download | gitlab-ce-b46ac16cc89d649bf5fba9a36f1911a575b41e1f.tar.gz | |
Merge branch '28187-project-name-cut-off-with-nested-groups' into 'master'
Resolve "Project name cut off with nested groups"
Closes #28187 and #28179
See merge request !10065
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 7ddee0e5244..7bf4bc70f7c 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -15,6 +15,13 @@ %span.sr-only Toggle navigation = icon('ellipsis-v') + .header-logo + = link_to root_path, class: 'home', title: 'Dashboard', id: 'logo' do + = brand_header_logo + + .title-container + %h1.title{ class: ('initializing' if @has_group_title) }= title + .navbar-collapse.collapse %ul.nav.navbar-nav %li.hidden-sm.hidden-xs @@ -63,12 +70,6 @@ %div = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success' - .header-logo - = link_to root_path, class: 'home', title: 'Dashboard', id: 'logo' do - = brand_header_logo - - %h1.title{ class: ('initializing' if @has_group_title) }= title - = yield :header_content = render 'shared/outdated_browser' |