diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-01 20:33:29 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-01 20:33:29 +0000 |
| commit | 13659fe7b692d37ade08875c78e84ca47a619957 (patch) | |
| tree | 20760569f70245ce097ae1680be72f0d10834364 | |
| parent | 09b7b766cbf42ed6e9e9246d494b60f05a7a28e7 (diff) | |
| parent | ba0c9b863a6e79d825744bd267a8c984a764235d (diff) | |
| download | gitlab-ce-13659fe7b692d37ade08875c78e84ca47a619957.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 95bdd6d1ea3..fc3b0a422a7 100644 --- 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) */ |