Layout navigation should respect layout width settings

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Layout navigation should respect layout width settings
f93b0f3e · Dmitriy Zaporozhets · 52268d1d · f93b0f3e · f93b0f3e
Unverified Commit f93b0f3e authored Apr 20, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 9 deletions

nav.scss app/assets/stylesheets/framework/nav.scss +0 -8

_page.html.haml app/views/layouts/_page.html.haml +2 -1

No files found.
--- 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;
-  }
-}
--- 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