diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-19 11:01:14 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-19 11:01:14 -0700 |
| commit | 6a0b6772544a3f5fcc82898e39d877ff2e4dfe53 (patch) | |
| tree | dfd9dd515572a06d695d45ed047a959e9d4d6d81 | |
| parent | f3f9dedcf70c1bf247945253f3cd9026ab87d421 (diff) | |
| download | gitlab-ce-41186-sidebar-too-much-vertical-scroll.tar.gz | |
Line up search dropdown with other nav dropdowns41186-sidebar-too-much-vertical-scroll
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/search.scss | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 22303e6ec14..bc907a390d8 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -28,7 +28,6 @@ .dropdown-menu, .dropdown-menu-nav { @include set-visible; - display: block; min-height: 40px; @media (max-width: $screen-xs-max) { @@ -47,6 +46,11 @@ } } +// Get search dropdown to line up with other nav dropdowns +.search-input-container .dropdown-menu { + margin-top: 11px; +} + .dropdown-toggle { padding: 6px 8px 6px 10px; background-color: $white-light; diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 2381d7eb92b..c9363188505 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -145,13 +145,6 @@ input[type="checkbox"]:hover { background-color: $nav-badge-bg; border-color: $border-color; } - - .dropdown-menu { - transition-duration: 100ms, 75ms; - transition-delay: 75ms, 100ms; - transform: translateY(7px); - opacity: 1; - } } &.has-value { |