diff options
author | Takuya Noguchi <takninnovationresearch@gmail.com> | 2017-11-06 02:13:11 +0300 |
---|---|---|
committer | Takuya Noguchi <takninnovationresearch@gmail.com> | 2017-11-06 15:22:26 +0300 |
commit | 68e3c41571b81d80c81d8ef0efc5dd0817b192c3 (patch) | |
tree | d48f1a400e48dbf097dcc1c22aa2c3aea7ac8d42 /app/assets/stylesheets/framework/selects.scss | |
parent | 823a9d351b49a6be8c12cfe06edb4aa6ec08fe95 (diff) |
Revert unintentional changes in !12810
Diffstat (limited to 'app/assets/stylesheets/framework/selects.scss')
-rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 52 |
1 files changed, 36 insertions, 16 deletions
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index aa35cd9bea4..69b1d865c35 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -60,12 +60,17 @@ border-radius: $border-radius-base; border: 1px solid $dropdown-border-color; min-width: 175px; - color: $gl-grayish-blue; + color: $gl-text-color; + z-index: 999; } -.select2-results .select2-result-label, -.select2-more-results { - padding: 10px 15px; +.select2-drop-mask { + z-index: 998; +} + +.select2-drop.select2-drop-above.select2-drop-active { + border-top: 1px solid $dropdown-border-color; + margin-top: -6px; } .select2-container-active { @@ -158,18 +163,35 @@ } } -.select2-results .select2-no-results, -.select2-results .select2-searching, -.select2-results .select2-ajax-error, -.select2-results .select2-selection-limit { - background: $gray-light; - display: list-item; - padding: 10px 15px; -} - .select2-results { margin: 0; - padding: 10px 0; + padding: #{$gl-padding / 2} 0; + + .select2-no-results, + .select2-searching, + .select2-ajax-error, + .select2-selection-limit { + background: transparent; + padding: #{$gl-padding / 2} $gl-padding; + } + + .select2-result-label, + .select2-more-results { + padding: #{$gl-padding / 2} $gl-padding; + } + + .select2-highlighted { + background: transparent; + color: $gl-text-color; + + .select2-result-label { + background: $dropdown-item-hover-bg; + } + } + + .select2-result { + padding: 0 1px; + } li.select2-result-with-children > .select2-result-label { font-weight: $gl-font-weight-bold; @@ -190,8 +212,6 @@ } .select2-highlighted { - background: $gl-link-color !important; - .group-result { .group-path { color: $white-light; |