diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-20 18:30:53 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-20 18:30:53 +0200 |
| commit | f93b0f3ea25af48f9f165cf6c0e3c2fb359bca35 (patch) | |
| tree | 7f847b88c5ee5df19a5ed3bb457557f03aebb2d8 | |
| parent | 52268d1d9a7c64886dcc99a1a82c02af1ccbe7a1 (diff) | |
| download | gitlab-ce-top-navigation-concept.tar.gz | |
Layout navigation should respect layout width settingstop-navigation-concept
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 8 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index e3f9825fe15..192d53b048a 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -185,11 +185,3 @@ } } } - -.layout-nav { - margin-bottom: 5px; - - .nav-links { - padding: 0 $gl-padding; - } -} diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index d4e5d5e4bfd..ca9c2a0bf2e 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -27,7 +27,8 @@ = yield :flash_message - if defined?(nav) && nav .layout-nav - = render "layouts/nav/#{nav}" + %div{ class: container_class } + = render "layouts/nav/#{nav}" %div{ class: (container_class unless @no_container) } .content .clearfix |