diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-20 20:56:16 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-20 20:56:16 +0000 |
| commit | 2cf17c429588d773de85f4440dbf5d6b39293c26 (patch) | |
| tree | 718291b016e3c3b905ad413c8c9093b821ea21cc /app/views/layouts | |
| parent | 608711c247c1d58bd8f38e459ea9897b76802dc3 (diff) | |
| parent | 0d72c8b210f7fd1e5d2878316de2d46d6fa0a611 (diff) | |
| download | gitlab-ce-2cf17c429588d773de85f4440dbf5d6b39293c26.tar.gz | |
Merge branch '27934-left-align-nav' into 'master'
Resolve "Left align nav items"
Closes #27934
See merge request !9338
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index a35a918d501..1717ed6b365 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -1,7 +1,7 @@ .page-with-sidebar{ class: page_gutter_class } - if defined?(nav) && nav .layout-nav - .container-fluid + %div{ class: container_class } = render "layouts/nav/#{nav}" .content-wrapper{ class: "#{layout_nav_class}" } = yield :sub_nav diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index ddf50d6667f..60b9b8bdbc4 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -61,12 +61,12 @@ %div = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success' - %h1.title= title - .header-logo = link_to root_path, class: 'home', title: 'Dashboard', id: 'logo' do = brand_header_logo + %h1.title= title + = yield :header_content = render 'shared/outdated_browser' |