Index: select2-bootstrap.css =================================================================== --- select2-bootstrap.css +++ select2-bootstrap.css @@ -9,16 +9,16 @@ * courtesy of @juristr (@see https://github.com/fk/select2-bootstrap-css/pull/1) */ .select2-container.form-control { background: transparent; + border: none; box-shadow: none; - border: none; display: block; /* 1 */ + margin: 0; padding: 0; } - /** * Adjust Select2 inputs to fit Bootstrap 3 default .form-control appearance. */ .select2-container .select2-choices .select2-search-field input, @@ -29,46 +29,41 @@ border-color: #cccccc; border-radius: 4px; color: #555555; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + background-color: #ffffff; - background-color: white; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } - .select2-search input { border-color: #cccccc; border-radius: 4px; color: #555555; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + background-color: #ffffff; - background-color: white; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } - .select2-container .select2-choices .select2-search-field input { -webkit-box-shadow: none; box-shadow: none; } - /** * Adjust Select2 input heights to match the Bootstrap default. */ .select2-container .select2-choice { height: 34px; + line-height: 1.428571429; - line-height: 1.42857; } - /** * Address Multi Select2's height which - depending on how many elements have been selected - * may grown higher than their initial size. */ .select2-container.select2-container-multi.form-control { height: auto; } - /** * Address Bootstrap 3 control sizing classes * @see http://getbootstrap.com/css/#forms-control-sizes */ @@ -77,79 +72,67 @@ height: 30px; line-height: 1.5; border-radius: 3px; } - .select2-container.input-lg .select2-choice, .input-group-lg .select2-container .select2-choice { height: 46px; + line-height: 1.3333333; - line-height: 1.33333; border-radius: 6px; } - .select2-container-multi .select2-choices .select2-search-field input { height: 32px; } - .select2-container-multi.input-sm .select2-choices .select2-search-field input, .input-group-sm .select2-container-multi .select2-choices .select2-search-field input { height: 28px; } - .select2-container-multi.input-lg .select2-choices .select2-search-field input, .input-group-lg .select2-container-multi .select2-choices .select2-search-field input { height: 44px; } - /** * Adjust height and line-height for .select2-search-field amd multi-select Select2 widgets. * * 1. Class repetition to address missing .select2-chosen in Select2 < 3.3.2. */ .select2-container-multi .select2-choices .select2-search-field input { margin: 0; } - .select2-chosen, .select2-choice > span:first-child, .select2-container .select2-choices .select2-search-field input { padding: 6px 12px; } - .input-sm .select2-chosen, .input-group-sm .select2-chosen, .input-sm .select2-choice > span:first-child, .input-group-sm .select2-choice > span:first-child, .input-sm .select2-choices .select2-search-field input, .input-group-sm .select2-choices .select2-search-field input { padding: 5px 10px; } - .input-lg .select2-chosen, .input-group-lg .select2-chosen, .input-lg .select2-choice > span:first-child, .input-group-lg .select2-choice > span:first-child, .input-lg .select2-choices .select2-search-field input, .input-group-lg .select2-choices .select2-search-field input { padding: 10px 16px; } - .select2-container-multi .select2-choices .select2-search-choice { margin-top: 5px; margin-bottom: 3px; } - .select2-container-multi.input-sm .select2-choices .select2-search-choice, .input-group-sm .select2-container-multi .select2-choices .select2-search-choice { margin-top: 3px; margin-bottom: 2px; } - .select2-container-multi.input-lg .select2-choices .select2-search-choice, .input-group-lg .select2-container-multi .select2-choices .select2-search-choice { line-height: 24px; } - /** * Adjust the single Select2's dropdown arrow button appearance. * * 1. For Select2 v.3.3.2. @@ -159,16 +142,14 @@ border-left: none; background: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } - .select2-dropdown-open .select2-choice .select2-arrow, .select2-dropdown-open .select2-choice div { border-left-color: transparent; background: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } - /** * Adjust the dropdown arrow button icon position for the single-select Select2 elements * to make it line up vertically now that we increased the height of .select2-container. * @@ -177,42 +158,36 @@ .select2-container .select2-choice .select2-arrow b, .select2-container .select2-choice div b { background-position: 0 3px; } - .select2-dropdown-open .select2-choice .select2-arrow b, .select2-dropdown-open .select2-choice div b { background-position: -18px 3px; } - .select2-container.input-sm .select2-choice .select2-arrow b, .input-group-sm .select2-container .select2-choice .select2-arrow b, .select2-container.input-sm .select2-choice div b, .input-group-sm .select2-container .select2-choice div b { background-position: 0 1px; } - .select2-dropdown-open.input-sm .select2-choice .select2-arrow b, .input-group-sm .select2-dropdown-open .select2-choice .select2-arrow b, .select2-dropdown-open.input-sm .select2-choice div b, .input-group-sm .select2-dropdown-open .select2-choice div b { background-position: -18px 1px; } - .select2-container.input-lg .select2-choice .select2-arrow b, .input-group-lg .select2-container .select2-choice .select2-arrow b, .select2-container.input-lg .select2-choice div b, .input-group-lg .select2-container .select2-choice div b { background-position: 0 9px; } - .select2-dropdown-open.input-lg .select2-choice .select2-arrow b, .input-group-lg .select2-dropdown-open .select2-choice .select2-arrow b, .select2-dropdown-open.input-lg .select2-choice div b, .input-group-lg .select2-dropdown-open .select2-choice div b { background-position: -18px 9px; } - /** * Address Bootstrap's validation states and change Select2's border colors and focus states. * Apply .has-warning, .has-danger or .has-succes to #select2-drop to match Bootstraps' colors. */ @@ -231,9 +206,8 @@ } .has-warning.select2-drop-active.select2-drop.select2-drop-above { border-top-color: #66512c; } - .has-error .select2-choice, .has-error .select2-choices { border-color: #a94442; } @@ -248,9 +222,8 @@ } .has-error.select2-drop-active.select2-drop.select2-drop-above { border-top-color: #843534; } - .has-success .select2-choice, .has-success .select2-choices { border-color: #3c763d; } @@ -265,9 +238,8 @@ } .has-success.select2-drop-active.select2-drop.select2-drop-above { border-top-color: #2b542c; } - /** * Make Select2's active-styles - applied to .select2-container when the widget receives focus - * fit Bootstrap 3's .form-element:focus appearance. */ @@ -280,18 +252,15 @@ -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; } - .select2-drop-active { border-color: #66afe9; } - .select2-drop-auto-width, .select2-drop.select2-drop-above.select2-drop-active { border-top-color: #66afe9; } - /** * Select2 widgets in Bootstrap Input Groups * * When Select2 widgets are combined with other elements using Bootstrap 3's @@ -312,25 +281,22 @@ .input-group.select2-bootstrap-prepend [class^="select2-choice"] { border-bottom-left-radius: 0 !important; border-top-left-radius: 0 !important; } - .input-group.select2-bootstrap-append [class^="select2-choice"] { border-bottom-right-radius: 0 !important; border-top-right-radius: 0 !important; } - .select2-dropdown-open [class^="select2-choice"] { border-bottom-right-radius: 0 !important; border-bottom-left-radius: 0 !important; } - .select2-dropdown-open.select2-drop-above [class^="select2-choice"] { border-top-right-radius: 0 !important; border-top-left-radius: 0 !important; border-bottom-right-radius: 4px !important; border-bottom-left-radius: 4px !important; + background: #ffffff; - background: white; filter: none; } .input-group.select2-bootstrap-prepend .select2-dropdown-open.select2-drop-above [class^="select2-choice"] { border-bottom-left-radius: 0 !important; @@ -351,68 +317,61 @@ } .input-group.input-group-lg.select2-bootstrap-append .select2-dropdown-open.select2-drop-above [class^="select2-choice"] { border-bottom-left-radius: 6px !important; } - /** * Adjust Select2's choices hover and selected styles to match Bootstrap 3's default dropdown styles. */ .select2-results .select2-highlighted { + color: #ffffff; - color: white; background-color: #337ab7; } - /** * Adjust alignment of Bootstrap 3 buttons in Bootstrap 3 Input Groups to address * Multi Select2's height which - depending on how many elements have been selected - * may grown higher than their initial size. */ .select2-bootstrap-append .select2-container-multiple, +.select2-bootstrap-prepend .select2-container-multiple, .select2-bootstrap-append .input-group-btn, +.select2-bootstrap-prepend .input-group-btn, .select2-bootstrap-append .input-group-btn .btn, -.select2-bootstrap-prepend .select2-container-multiple, -.select2-bootstrap-prepend .input-group-btn, .select2-bootstrap-prepend .input-group-btn .btn { vertical-align: top; } - /** * Make Multi Select2's choices match Bootstrap 3's default button styles. */ .select2-container-multi .select2-choices .select2-search-choice { color: #555555; + background: #ffffff; - background: white; border-color: #cccccc; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: none; box-shadow: none; } - .select2-container-multi .select2-choices .select2-search-choice-focus { background: #ebebeb; border-color: #adadad; color: #333333; -webkit-box-shadow: none; box-shadow: none; } - /** * Address Multi Select2's choice close-button vertical alignment. */ .select2-search-choice-close { margin-top: -7px; top: 50%; } - /** * Adjust the single Select2's clear button position (used to reset the select box * back to the placeholder value and visible once a selection is made * activated by Select2's "allowClear" option). */ .select2-container .select2-choice abbr { top: 50%; } - /** * Adjust "no results" and "selection limit" messages to make use * of Bootstrap 3's default "Alert" style. * @@ -423,9 +382,8 @@ .select2-results .select2-selection-limit { background-color: #fcf8e3; color: #8a6d3b; } - /** * Address disabled Select2 styles. * * 1. For Select2 v.3.3.2. @@ -438,16 +396,16 @@ background-color: #eeeeee; border-color: #cccccc; } .select2-container.select2-container-disabled .select2-choice .select2-arrow, +.select2-container.select2-container-disabled .select2-choices .select2-arrow, .select2-container.select2-container-disabled .select2-choice div, -.select2-container.select2-container-disabled .select2-choices .select2-arrow, .select2-container.select2-container-disabled .select2-choices div { background-color: transparent; border-left: 1px solid transparent; /* 2 */ + } - /** * Address Select2's loading indicator position - which should not stick * to the right edge of Select2's search input. * @@ -472,19 +430,20 @@ .select2-container-multi .select2-choices .select2-search-field input.select2-active, .select2-more-results.select2-active { background-position: 99%; /* 4 */ + background-position: right 4px center; /* 5 */ + } - /** * To support Select2 pre v3.4.2 in combination with Bootstrap v3.2.0, * ensure that .select2-offscreen width, height and position can not be overwritten. * + * This adresses changes in Bootstrap somewhere after the initial v3.0.0 which – - * This adresses changes in Bootstrap somewhere after the initial v3.0.0 which - * in combination with Select2's pre-v3.4.2 CSS missing the "!important" after + * the following rules – allow Bootstrap to overwrite the latter, which results in - * the following rules - allow Bootstrap to overwrite the latter, which results in * the original