From 257ea25e4521925033f252717cf6516093b4185b Mon Sep 17 00:00:00 2001 From: Fred Wu Date: Tue, 13 Aug 2013 21:10:30 +1000 Subject: [PATCH 1/2] Input outline styling should apply to the dropdown too --- lib/select2-bootstrap.less | 9 +++++---- lib/select2-bootstrap.scss | 9 +++++---- select2-bootstrap.css | 7 ++++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/select2-bootstrap.less b/lib/select2-bootstrap.less index 318edaa..86e39fa 100644 --- a/lib/select2-bootstrap.less +++ b/lib/select2-bootstrap.less @@ -3,7 +3,7 @@ * Compatible with select2 3.3.2 and bootstrap 2.3.1 * MIT License */ - + .select2-container { vertical-align: middle; &.input-mini { width: 60px; } @@ -50,6 +50,7 @@ line-height: 27px; } +.select2-drop.select2-drop-active, .select2-container-active .select2-choice, .select2-container-multi.select2-container-active .select2-choices { border-color: rgba(82, 168, 236, 0.8); @@ -86,9 +87,9 @@ } /** - * This stops the quick flash when a native selectbox is shown and - * then replaced by a select2 input when javascript kicks in. This can be - * removed if javascript is not present + * This stops the quick flash when a native selectbox is shown and + * then replaced by a select2 input when javascript kicks in. This can be + * removed if javascript is not present */ select.select2 { diff --git a/lib/select2-bootstrap.scss b/lib/select2-bootstrap.scss index 477767f..8de0977 100644 --- a/lib/select2-bootstrap.scss +++ b/lib/select2-bootstrap.scss @@ -3,7 +3,7 @@ * Compatible with select2 3.3.2 and bootstrap 2.3.1 * MIT License */ - + .select2-container { vertical-align: middle; &.input-mini { width: 60px; } @@ -50,6 +50,7 @@ line-height: 27px; } +.select2-drop.select2-drop-active, .select2-container-active .select2-choice, .select2-container-multi.select2-container-active .select2-choices { border-color: rgba(82, 168, 236, 0.8); @@ -86,9 +87,9 @@ } /** - * This stops the quick flash when a native selectbox is shown and - * then replaced by a select2 input when javascript kicks in. This can be - * removed if javascript is not present + * This stops the quick flash when a native selectbox is shown and + * then replaced by a select2 input when javascript kicks in. This can be + * removed if javascript is not present */ select.select2 { diff --git a/select2-bootstrap.css b/select2-bootstrap.css index 3c08d5d..fddaebe 100644 --- a/select2-bootstrap.css +++ b/select2-bootstrap.css @@ -65,6 +65,7 @@ line-height: 27px; } +.select2-drop.select2-drop-active, .select2-container-active .select2-choice, .select2-container-multi.select2-container-active .select2-choices { border-color: rgba(82, 168, 236, 0.8); @@ -103,9 +104,9 @@ } /** - * This stops the quick flash when a native selectbox is shown and - * then replaced by a select2 input when javascript kicks in. This can be - * removed if javascript is not present + * This stops the quick flash when a native selectbox is shown and + * then replaced by a select2 input when javascript kicks in. This can be + * removed if javascript is not present */ select.select2 { height: 28px; From 06de5c4df5fe07edf6c03e418df372e85d95c1f6 Mon Sep 17 00:00:00 2001 From: Fred Wu Date: Tue, 13 Aug 2013 21:11:54 +1000 Subject: [PATCH 2/2] Fixes input outline colour in IE8 --- lib/select2-bootstrap.less | 1 + lib/select2-bootstrap.scss | 1 + select2-bootstrap.css | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/select2-bootstrap.less b/lib/select2-bootstrap.less index 86e39fa..cd5c9bb 100644 --- a/lib/select2-bootstrap.less +++ b/lib/select2-bootstrap.less @@ -54,6 +54,7 @@ .select2-container-active .select2-choice, .select2-container-multi.select2-container-active .select2-choices { border-color: rgba(82, 168, 236, 0.8); + border-color: #ccc\0; outline: none; .box-shadow(~"inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6)"); } diff --git a/lib/select2-bootstrap.scss b/lib/select2-bootstrap.scss index 8de0977..fe9f990 100644 --- a/lib/select2-bootstrap.scss +++ b/lib/select2-bootstrap.scss @@ -54,6 +54,7 @@ .select2-container-active .select2-choice, .select2-container-multi.select2-container-active .select2-choices { border-color: rgba(82, 168, 236, 0.8); + border-color: #ccc\0; outline: none; @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6)); } diff --git a/select2-bootstrap.css b/select2-bootstrap.css index fddaebe..6249bc7 100644 --- a/select2-bootstrap.css +++ b/select2-bootstrap.css @@ -69,6 +69,7 @@ .select2-container-active .select2-choice, .select2-container-multi.select2-container-active .select2-choices { border-color: rgba(82, 168, 236, 0.8); + border-color: #ccc\0; outline: none; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);