diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-17 21:18:07 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-07-20 17:04:18 -0500 |
| commit | fc0c765efa529063504b68e6c23b2707f35cc605 (patch) | |
| tree | cc76deb33d0db9017ab66a81f5cd3efc73a1c6d1 | |
| parent | 7bcad3cd38618a2a52ca0fd158b8981dbde103d9 (diff) | |
| download | gitlab-ce-fc0c765efa529063504b68e6c23b2707f35cc605.tar.gz | |
Merge branch '35177-dropdown-padding' into 'master'
fix padding on filtered search
Closes #35177
See merge request !12913
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 32 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/filters.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 |
3 files changed, 20 insertions, 21 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index ae40258fa8d..822e9326c7a 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -291,18 +291,12 @@ } .droplab-dropdown { - .description { - display: inline-block; - white-space: normal; - margin-left: 5px; - } - .dropdown-toggle > i { pointer-events: none; } - li { - padding: $gl-btn-padding $gl-btn-padding 2px; + .dropdown-menu li { + padding: $gl-btn-padding; cursor: pointer; > a, @@ -338,9 +332,25 @@ visibility: visible; } + &.divider { + margin: 0 8px; + padding: 0; + border-top: $gray-darkest; + } + .icon { visibility: hidden; } + + .description { + display: inline-block; + white-space: normal; + margin-left: 5px; + + p { + margin-bottom: 0; + } + } } .icon { @@ -348,12 +358,6 @@ vertical-align: top; padding-top: 2px; } - - .divider { - margin: 0 8px; - padding: 0; - border-top: $gray-darkest; - } } .droplab-dropdown .dropdown-menu, diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index f05348ee4e3..455a2aa085e 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -275,7 +275,7 @@ } .filtered-search-input-dropdown-menu { - max-height: 215px; + max-height: 225px; max-width: 280px; overflow: auto; @@ -382,10 +382,6 @@ } } -.dropdown-menu .filter-dropdown-item { - padding: 0; -} - @media (max-width: $screen-xs-max) { .issues-details-filters { padding: 0 0 10px; @@ -435,6 +431,7 @@ .fa { width: 15px; + line-height: $line-height-base; } .dropdown-label-box { diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 56a4b53ed61..e858ef427b0 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -813,8 +813,6 @@ } .description { - margin-bottom: 10px; - .text { margin: 0; } |