diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-23 15:18:08 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-23 15:18:08 +0000 |
commit | b9f076180e1cef1f23cf2017ac5431863658b27e (patch) | |
tree | aceea77c340ad5a4faae4aea08ee313f6d53d56c | |
parent | 8f6619885f95bdafaacddacda4c552f30e8a90a4 (diff) | |
parent | a607ba4cdda65bdc352064a5d77030d554e93f60 (diff) | |
download | gitlab-ce-b9f076180e1cef1f23cf2017ac5431863658b27e.tar.gz |
Merge branch 'winh-filters-dropdown-scroll' into 'master'
Make static filter entries scroll with dynamic ones
See merge request !11640
-rw-r--r-- | app/assets/stylesheets/framework/filters.scss | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index 637731cc479..f0994e968c8 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -263,7 +263,9 @@ } .filtered-search-input-dropdown-menu { + max-height: 215px; max-width: 280px; + overflow: auto; @media (max-width: $screen-xs-min) { width: auto; @@ -372,11 +374,6 @@ padding: 0; } -.filter-dropdown { - max-height: 215px; - overflow: auto; -} - @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { .issue-bulk-update-dropdown-toggle { width: 100px; |