diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-18 09:41:49 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-18 14:00:32 -0500 |
| commit | 57e4f68ff8b9fffb80b2188db1f8d3a16ac5a7e6 (patch) | |
| tree | 304165d682b3f38b471e6a523ab8c689c4e6b745 | |
| parent | 229b1e2e603fb45df32a7e3fe0e90438a9ff7c4f (diff) | |
| download | gitlab-ce-57e4f68ff8b9fffb80b2188db1f8d3a16ac5a7e6.tar.gz | |
Fix conflicts
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index b1b9b680cfe..c5460d280ce 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -350,7 +350,6 @@ .scrolling-tabs-container { position: relative; - overflow: hidden; .merge-request-tabs-container & { overflow: hidden; @@ -493,10 +492,6 @@ .inner-page-scroll-tabs { position: relative; - .nav-links { - padding-bottom: 1px; - } - .fade-right { @include fade(left, $white-light); right: 0; |