diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-11-30 22:35:44 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-11-30 22:35:44 +0000 |
| commit | 3a8d646f25ff94c9886ca4c60aa313479db88848 (patch) | |
| tree | c3224116e1ae4e1ff905509ebf270186bf1247a7 | |
| parent | 563b40e499e5eb353675370898521969a03897e4 (diff) | |
| parent | 45d7083daebf89296f07da5939f0dc2eb8ee0daa (diff) | |
| download | gitlab-ce-3a8d646f25ff94c9886ca4c60aa313479db88848.tar.gz | |
Merge branch 'winh-select2-search-padding' into 'master'
Align Select2 search field
Closes #39451
See merge request gitlab-org/gitlab-ce!15048
| -rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index bb70b270299..dbee7073975 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -134,19 +134,22 @@ } .select2-search { - padding: 15px 15px 5px; + padding: $grid-size; .select2-drop-auto-width & { - padding: 15px 15px 5px; + padding: $grid-size; } input { - padding: 2px 25px 2px 5px; + padding: $grid-size; background: $white-light image-url('select2.png'); + background-clip: content-box; + background-origin: content-box; background-repeat: no-repeat; - background-position: right 0 bottom 6px; + background-position: right 0 bottom 0 !important; border: 1px solid $input-border; border-radius: $border-radius-default; + line-height: 16px; transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; &:focus { @@ -156,11 +159,16 @@ &.select2-active { background-color: $white-light; background-image: image-url('select2-spinner.gif') !important; + background-origin: content-box; background-repeat: no-repeat; - background-position: right 5px center !important; + background-position: right 6px center !important; background-size: 16px 16px !important; } } + + + .select2-results { + padding-top: 0; + } } .select2-results { |