From a583c7070e475912b3bdfc58d6bf859db6b22208 Mon Sep 17 00:00:00 2001 From: tchiotludo Date: Fri, 6 May 2016 10:43:09 +0200 Subject: [PATCH 1/2] Selection Choice color & vars --- src/select2-bootstrap.less | 9 +++++---- src/select2-bootstrap.scss | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/select2-bootstrap.less b/src/select2-bootstrap.less index a9e81a9..91c2c7b 100755 --- a/src/select2-bootstrap.less +++ b/src/select2-bootstrap.less @@ -22,7 +22,8 @@ @dropdown-arrow-color: @input-color-placeholder; @dropdown-box-shadow: 0 6px 12px rgba(0,0,0,.175); @clear-selection-color: @dropdown-arrow-color; - +@selection-choice-color: #999; +@selection-choice-color-hover: #333; @@ -426,7 +427,7 @@ */ .select2-selection__choice { - color: @input-color; + color: @btn-default-color; background: @btn-default-bg; border: 1px solid @btn-default-border; border-radius: 4px; @@ -452,14 +453,14 @@ } .select2-selection__choice__remove { - color: #999; + color: @selection-choice-color; cursor: pointer; display: inline-block; font-weight: bold; margin-right: @padding-base-vertical / 2; &:hover { - color: #333; + color: @selection-choice-color-hover; } } diff --git a/src/select2-bootstrap.scss b/src/select2-bootstrap.scss index 5fb6b5d..7ee7ca0 100755 --- a/src/select2-bootstrap.scss +++ b/src/select2-bootstrap.scss @@ -22,7 +22,8 @@ $form-control-transition: border-color ease-in-out .15s, box-shadow ease-in-out $dropdown-arrow-color: $input-color-placeholder !default; $dropdown-box-shadow: 0 6px 12px rgba(0,0,0,.175) !default; $clear-selection-color: $dropdown-arrow-color !default; - +$selection-choice-color: #999 !default; +$selection-choice-color-hover: #333 !default; @@ -426,7 +427,7 @@ $clear-selection-color: $dropdown-arrow-color !default; */ .select2-selection__choice { - color: $input-color; + color: $btn-default-color; background: $btn-default-bg; border: 1px solid $btn-default-border; border-radius: 4px; @@ -452,14 +453,14 @@ $clear-selection-color: $dropdown-arrow-color !default; } .select2-selection__choice__remove { - color: #999; + color: $selection-choice-color; cursor: pointer; display: inline-block; font-weight: bold; margin-right: $padding-base-vertical / 2; &:hover { - color: #333; + color: $selection-choice-color-hover; } } From 416a51576f1aa0a7ce98a737ed1019d2cbf308a6 Mon Sep 17 00:00:00 2001 From: tchiotludo Date: Tue, 26 Jul 2016 17:39:58 +0200 Subject: [PATCH 2/2] Optgroup is too small --- src/select2-bootstrap.less | 2 +- src/select2-bootstrap.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/select2-bootstrap.less b/src/select2-bootstrap.less index 91c2c7b..403273a 100755 --- a/src/select2-bootstrap.less +++ b/src/select2-bootstrap.less @@ -224,7 +224,7 @@ color: @dropdown-header-color; display: block; padding: @padding-base-vertical @padding-base-horizontal; - font-size: @font-size-small; + font-size: @font-size-base; line-height: @line-height-base; white-space: nowrap; } diff --git a/src/select2-bootstrap.scss b/src/select2-bootstrap.scss index 7ee7ca0..e050b5d 100755 --- a/src/select2-bootstrap.scss +++ b/src/select2-bootstrap.scss @@ -224,7 +224,7 @@ $selection-choice-color-hover: #333 !default; color: $dropdown-header-color; display: block; padding: $padding-base-vertical $padding-base-horizontal; - font-size: $font-size-small; + font-size: $font-size-base; line-height: $line-height-base; white-space: nowrap; }