Show bottom border for one and 2 row header

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

app/assets/stylesheets/framework/header.scss

@@ -28,7 +28,7 @@ header {
     min-height: $header-height;
     background-color: $gray-light;
     border: none;
-    border-bottom: 1px solid $gray-light;
+    border-bottom: 1px solid $border-color;
     .container-fluid {
       width: 100% !important;

app/assets/stylesheets/framework/nav.scss

@@ -187,7 +187,10 @@
 }
 .layout-nav {
-  background: $background-color;
+  position: relative;
+  z-index: 101;
+  margin-top: -1px;
+  background: $gray-light;
   border-bottom: 1px solid $border-color;
   .container-fluid {

app/views/layouts/_page.html.haml

@@ -22,12 +22,12 @@
         = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
         .username
           = current_user.username
+  - if defined?(nav) && nav
+    .layout-nav
+      = render "layouts/nav/#{nav}"
   .content-wrapper
     = render "layouts/flash"
     = yield :flash_message
-    - if defined?(nav) && nav
-      .layout-nav
-        = render "layouts/nav/#{nav}"
     %div{ class: (container_class unless @no_container) }
       .content
         .clearfix