Merge branch 'dz-fix-nav-block' into 'master'

Remove 1px whitespace between nav tabs and underline when form present Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3489

Merge branch 'dz-fix-nav-block' into 'master'
13659fe7 · Jacob Schatz · 09b7b766 · ba0c9b86 · 13659fe7
Commit 13659fe7 authored Apr 01, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

nav.scss app/assets/stylesheets/framework/nav.scss +2 -1

No files found.
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -100,6 +100,7 @@

    > form {
      display: inline-block;
+      margin-top: -1px;
    }

    .icon-label {
@@ -110,7 +111,7 @@
      height: 34px;
      display: inline-block;
      position: relative;
-      top: 1px;
+      top: 2px;
      margin-right: $gl-padding-top;

      /* Medium devices (desktops, 992px and up) */