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 09:41:49 -0500 |
| commit | 08941e47515a1f46c3d4e9b1e19ca667ad621abb (patch) | |
| tree | ebbae9d4408abb966a85234194716e48d2fe3cc7 | |
| parent | 48c9a11da7a54a834b6326c224818280eaedc547 (diff) | |
| download | gitlab-ce-9-2-stable-fix-conflicts-for-mr-11399.tar.gz | |
Fix conflicts9-2-stable-fix-conflicts-for-mr-11399
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 736abdd6564..025ce0bd88c 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -346,13 +346,10 @@ .scrolling-tabs-container { position: relative; -<<<<<<< HEAD -======= .merge-request-tabs-container & { overflow: hidden; } ->>>>>>> 10a9ba3... Merge branch '32326-scrollable-tabs-overflow' into 'master'
.nav-links { @include scrolling-links(); @@ -490,13 +487,6 @@ .inner-page-scroll-tabs { position: relative; -<<<<<<< HEAD - - .nav-links { - padding-bottom: 1px; - } -======= ->>>>>>> 10a9ba3... Merge branch '32326-scrollable-tabs-overflow' into 'master'
.fade-right { @include fade(left, $white-light); |