From b993f20843f389f5af24c5a1d53160fecefc5b77 Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Fri, 6 Feb 2015 20:18:02 +0100
Subject: [PATCH 01/12] Adjust to Select2 moving its examples from
//ivaynberg.github.io/select2/ to //select2.github.io/select2/.
Fixes #64.
---
_jekyll/_layouts/default.html | 4 ++--
_jekyll/_layouts/minimal.html | 4 ++--
docs/3.3.2.html | 4 ++--
docs/3.4.1.html | 4 ++--
docs/index.html | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/_jekyll/_layouts/default.html b/_jekyll/_layouts/default.html
index 2073c99..49340c3 100644
--- a/_jekyll/_layouts/default.html
+++ b/_jekyll/_layouts/default.html
@@ -3,8 +3,8 @@
-
-
+
+
diff --git a/_jekyll/_layouts/minimal.html b/_jekyll/_layouts/minimal.html
index ef3d3d7..d731abd 100644
--- a/_jekyll/_layouts/minimal.html
+++ b/_jekyll/_layouts/minimal.html
@@ -3,8 +3,8 @@
-
-
+
+
diff --git a/docs/3.3.2.html b/docs/3.3.2.html
index 1608c9b..9b88a07 100644
--- a/docs/3.3.2.html
+++ b/docs/3.3.2.html
@@ -3,8 +3,8 @@
-
-
+
+
diff --git a/docs/3.4.1.html b/docs/3.4.1.html
index 6cd5cd0..e6a97fe 100644
--- a/docs/3.4.1.html
+++ b/docs/3.4.1.html
@@ -3,8 +3,8 @@
-
-
+
+
diff --git a/docs/index.html b/docs/index.html
index e539fed..9977f15 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,8 +3,8 @@
-
-
+
+
From 41e40247e62fb669e5511fcb02fb6cdde22e1a07 Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Tue, 31 Mar 2015 19:32:50 +0200
Subject: [PATCH 02/12] Ignore `bower_components` instead of `components`.
---
.gitignore | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 71904c3..2a7940f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
build
-components
+bower_components
node_modules
.sass-cache
gh-pages
tmp
Gemfile.lock
-.ruby-version
\ No newline at end of file
+.ruby-version
From 57b4d30be6a6adb0a8b307d8ff45fdf08d21d383 Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Tue, 31 Mar 2015 20:02:35 +0200
Subject: [PATCH 03/12] Fix #78.
---
lib/build.less | 6 +++---
lib/build.scss | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/build.less b/lib/build.less
index cbb99d3..02168ca 100644
--- a/lib/build.less
+++ b/lib/build.less
@@ -1,3 +1,3 @@
-@import "../components/bootstrap/less/variables";
-@import "../components/bootstrap/less/mixins";
-@import "select2-bootstrap.less";
\ No newline at end of file
+@import "../bower_components/bootstrap/less/variables";
+@import "../bower_components/bootstrap/less/mixins";
+@import "select2-bootstrap.less";
diff --git a/lib/build.scss b/lib/build.scss
index 2975986..96030d5 100644
--- a/lib/build.scss
+++ b/lib/build.scss
@@ -1,3 +1,3 @@
-@import "../components/sass-bootstrap/lib/variables";
-@import "../components/sass-bootstrap/lib/mixins";
-@import "select2-bootstrap.scss";
\ No newline at end of file
+@import "../bower_components/sass-bootstrap/lib/variables";
+@import "../bower_components/sass-bootstrap/lib/mixins";
+@import "select2-bootstrap.scss";
From 18c4a16c9291509207b4c8ce5d523aaa765fb41c Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Wed, 1 Apr 2015 02:31:17 +0200
Subject: [PATCH 04/12] Fix compilation with Sass v3.4.x; fixes #79.
* update grunt-contrib-sass to latest version; while at this, update all dependencies
* adjust grunt-contrib-sass options to prevent sourcemap output
* update Less patch to reflect change in Sass' output of hex-colors
---
Gruntfile.js | 8 +++++---
_jekyll/select2-bootstrap.css | 12 +++++++-----
bower.json | 4 ++--
docs/select2-bootstrap.css | 12 +++++++-----
package.json | 16 ++++++++--------
select2-bootstrap.css | 4 ++--
test/support/less.patch | 16 +++++++++-------
7 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index dae0dac..e77e85b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,13 +7,15 @@ module.exports = function(grunt) {
nodeunit: {
all: ['test/*_test.js']
},
-
+
sass: {
options: {
- style: 'expanded'
+ style: 'expanded',
+ sourcemap: 'none'
},
dist: {
files: {
+ '_jekyll/select2-bootstrap.css': 'lib/build.scss',
'docs/select2-bootstrap.css': 'lib/build.scss',
'select2-bootstrap.css': 'lib/build.scss'
}
@@ -38,4 +40,4 @@ module.exports = function(grunt) {
});
-};
\ No newline at end of file
+};
diff --git a/_jekyll/select2-bootstrap.css b/_jekyll/select2-bootstrap.css
index 3c08d5d..fab0829 100644
--- a/_jekyll/select2-bootstrap.css
+++ b/_jekyll/select2-bootstrap.css
@@ -36,12 +36,12 @@
.select2-container-multi .select2-choices {
height: 28px;
line-height: 29px;
- border: 1px solid #cccccc;
+ border: 1px solid #ccc;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
background: none;
- background-color: white;
+ background-color: #fff;
filter: none;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -65,9 +65,11 @@
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);
+ 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);
@@ -103,9 +105,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;
diff --git a/bower.json b/bower.json
index 2e598a6..4e591df 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,7 @@
"select2": "^3.3.2"
},
"devDependencies": {
- "bootstrap": "~2.3.1",
- "sass-bootstrap": "git://github.com/jlong/sass-twitter-bootstrap.git#~2.3.1"
+ "bootstrap": "~2.3.2",
+ "sass-bootstrap": "git://github.com/jlong/sass-twitter-bootstrap.git#~2.3.2"
}
}
\ No newline at end of file
diff --git a/docs/select2-bootstrap.css b/docs/select2-bootstrap.css
index 3c08d5d..fab0829 100644
--- a/docs/select2-bootstrap.css
+++ b/docs/select2-bootstrap.css
@@ -36,12 +36,12 @@
.select2-container-multi .select2-choices {
height: 28px;
line-height: 29px;
- border: 1px solid #cccccc;
+ border: 1px solid #ccc;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
background: none;
- background-color: white;
+ background-color: #fff;
filter: none;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -65,9 +65,11 @@
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);
+ 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);
@@ -103,9 +105,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;
diff --git a/package.json b/package.json
index 0460ec7..108e561 100644
--- a/package.json
+++ b/package.json
@@ -21,13 +21,13 @@
"license": "MIT",
"readmeFilename": "README.md",
"devDependencies": {
- "grunt": "~0.4.1",
- "grunt-contrib-nodeunit": "~0.1.2",
- "diff": "~1.0.4",
- "grunt-contrib-sass": "~0.3.0",
- "bower": "~0.9.2",
- "grunt-contrib-jshint": "~0.6.0",
- "grunt-bump": "0.0.11",
- "matchdep": "~0.1.2"
+ "grunt": "~0.4.5",
+ "grunt-contrib-nodeunit": "~0.4.1",
+ "diff": "~1.3.2",
+ "grunt-contrib-sass": "~0.9.2",
+ "bower": "~1.4.0",
+ "grunt-contrib-jshint": "~0.11.1",
+ "grunt-bump": "0.3.0",
+ "matchdep": "~0.3.0"
}
}
diff --git a/select2-bootstrap.css b/select2-bootstrap.css
index 6249bc7..fab0829 100644
--- a/select2-bootstrap.css
+++ b/select2-bootstrap.css
@@ -36,12 +36,12 @@
.select2-container-multi .select2-choices {
height: 28px;
line-height: 29px;
- border: 1px solid #cccccc;
+ border: 1px solid #ccc;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
background: none;
- background-color: white;
+ background-color: #fff;
filter: none;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
diff --git a/test/support/less.patch b/test/support/less.patch
index a1ab642..3da885e 100644
--- a/test/support/less.patch
+++ b/test/support/less.patch
@@ -34,7 +34,7 @@ Index: select2-bootstrap.css
* Select2 Bootstrap CSS 1.0
* Compatible with select2 3.3.2 and bootstrap 2.3.1
* MIT License
-@@ -30,9 +57,8 @@
+@@ -30,42 +57,38 @@
.select2-container[class*="span"] {
float: none;
margin-left: 0;
@@ -44,13 +44,14 @@ Index: select2-bootstrap.css
.select2-container-multi .select2-choices {
height: 28px;
line-height: 29px;
-@@ -40,69 +66,59 @@
++ border: 1px solid #cccccc;
+- border: 1px solid #ccc;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
background: none;
+ background-color: #ffffff;
-- background-color: white;
+- background-color: #fff;
filter: none;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -76,10 +77,11 @@ Index: select2-bootstrap.css
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);
- outline: none;
+@@ -74,37 +97,30 @@
-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);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -114,6 +116,6 @@ Index: select2-bootstrap.css
}
-
/**
- * 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
From 416aed798ff015d1f7d3b3fe76add6dddf48b0ef Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Wed, 1 Apr 2015 02:54:39 +0200
Subject: [PATCH 05/12] Make clear that the master branch is for Bootstrap 2;
point users to the bootstrap3 branch.
---
README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 5a5178f..9792004 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
# Select2 Bootstrap CSS
-This is a bare bones stylesheet for making select2 fit in with bootstrap a bit better.
+Simple CSS to make Select2 widgets fit in with Bootstrap.
+*This branch (`master`) contains the legacy version for Bootstrap 2.
+If you are looking for the Bootstrap 3 version, please head over to the [`bootstrap3` branch](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3).*
The LESS file is located at lib/select2-bootstrap.less, and the SCSS file is located at lib/select2-bootstrap.scss.
From ca83b7fc76dfebf55afdd2d39887b13b88b024b5 Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Wed, 1 Apr 2015 03:16:33 +0200
Subject: [PATCH 06/12] Fix `pages_setup` rule.
---
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index 56409a5..45f7a42 100644
--- a/Makefile
+++ b/Makefile
@@ -16,4 +16,5 @@ pages_setup:
mkdir gh-pages
git init gh-pages
cd gh-pages; git remote add origin git@github.com:t0m/select2-bootstrap-css.git
+ cd gh-pages; git fetch
cd gh-pages; git checkout gh-pages
From 4d936eb0e17040378c0574e04b1ce75b0612bbac Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Wed, 1 Apr 2015 03:37:47 +0200
Subject: [PATCH 07/12] Fix version number in compiled CSS, fixes #80.
---
_jekyll/select2-bootstrap.css | 4 ++--
docs/select2-bootstrap.css | 4 ++--
lib/select2-bootstrap.less | 4 ++--
lib/select2-bootstrap.scss | 4 ++--
select2-bootstrap.css | 4 ++--
test/support/less.patch | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/_jekyll/select2-bootstrap.css b/_jekyll/select2-bootstrap.css
index fab0829..24c7cf1 100644
--- a/_jekyll/select2-bootstrap.css
+++ b/_jekyll/select2-bootstrap.css
@@ -1,6 +1,6 @@
/**
- * Select2 Bootstrap CSS 1.0
- * Compatible with select2 3.3.2 and bootstrap 2.3.1
+ * Select2 Bootstrap CSS v1.2.4
+ * Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
*/
.select2-container {
diff --git a/docs/select2-bootstrap.css b/docs/select2-bootstrap.css
index fab0829..24c7cf1 100644
--- a/docs/select2-bootstrap.css
+++ b/docs/select2-bootstrap.css
@@ -1,6 +1,6 @@
/**
- * Select2 Bootstrap CSS 1.0
- * Compatible with select2 3.3.2 and bootstrap 2.3.1
+ * Select2 Bootstrap CSS v1.2.4
+ * Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
*/
.select2-container {
diff --git a/lib/select2-bootstrap.less b/lib/select2-bootstrap.less
index cd5c9bb..bcd7b9f 100644
--- a/lib/select2-bootstrap.less
+++ b/lib/select2-bootstrap.less
@@ -1,6 +1,6 @@
/**
- * Select2 Bootstrap CSS 1.0
- * Compatible with select2 3.3.2 and bootstrap 2.3.1
+ * Select2 Bootstrap CSS v1.2.4
+ * Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
*/
diff --git a/lib/select2-bootstrap.scss b/lib/select2-bootstrap.scss
index fe9f990..8f6960b 100644
--- a/lib/select2-bootstrap.scss
+++ b/lib/select2-bootstrap.scss
@@ -1,6 +1,6 @@
/**
- * Select2 Bootstrap CSS 1.0
- * Compatible with select2 3.3.2 and bootstrap 2.3.1
+ * Select2 Bootstrap CSS v1.2.4
+ * Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
*/
diff --git a/select2-bootstrap.css b/select2-bootstrap.css
index fab0829..24c7cf1 100644
--- a/select2-bootstrap.css
+++ b/select2-bootstrap.css
@@ -1,6 +1,6 @@
/**
- * Select2 Bootstrap CSS 1.0
- * Compatible with select2 3.3.2 and bootstrap 2.3.1
+ * Select2 Bootstrap CSS v1.2.4
+ * Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
*/
.select2-container {
diff --git a/test/support/less.patch b/test/support/less.patch
index 3da885e..d97eba4 100644
--- a/test/support/less.patch
+++ b/test/support/less.patch
@@ -31,8 +31,8 @@ Index: select2-bootstrap.css
+ box-sizing: border-box;
+}
/**
- * Select2 Bootstrap CSS 1.0
- * Compatible with select2 3.3.2 and bootstrap 2.3.1
+ * Select2 Bootstrap CSS v1.2.4
+ * Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
@@ -30,42 +57,38 @@
.select2-container[class*="span"] {
From bbc77dee23d86120e2f099c5293b4792e8749460 Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Wed, 1 Apr 2015 03:43:31 +0200
Subject: [PATCH 08/12] =?UTF-8?q?Update=20Bootstrap=20on=20demo=20pages=20?=
=?UTF-8?q?from=20v2.3.1=20to=20v2.3.2=20=E2=80=93=20the=20latest=202.x.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
_jekyll/_layouts/default.html | 4 ++--
_jekyll/_layouts/minimal.html | 2 +-
docs/3.3.2.html | 4 ++--
docs/3.4.1.html | 4 ++--
docs/index.html | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/_jekyll/_layouts/default.html b/_jekyll/_layouts/default.html
index 49340c3..401d634 100644
--- a/_jekyll/_layouts/default.html
+++ b/_jekyll/_layouts/default.html
@@ -5,7 +5,7 @@
-
+
@@ -183,7 +183,7 @@ Select2 version {{ page.version }}
-
+
diff --git a/docs/3.3.2.html b/docs/3.3.2.html
index 9b88a07..4515734 100644
--- a/docs/3.3.2.html
+++ b/docs/3.3.2.html
@@ -5,7 +5,7 @@
-
+
@@ -185,7 +185,7 @@ Select2 version 3.3.2
-
+
@@ -185,7 +185,7 @@ Select2 version 3.4.1
-
+
From 989c1ec14756b404a418c2202393ec3ac70f8700 Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Wed, 1 Apr 2015 04:35:37 +0200
Subject: [PATCH 09/12] Calmer Select2 dropdown box-shadow style, fixes #81.
---
_jekyll/select2-bootstrap.css | 4 ++++
docs/select2-bootstrap.css | 4 ++++
lib/select2-bootstrap.less | 4 ++++
lib/select2-bootstrap.scss | 4 ++++
select2-bootstrap.css | 4 ++++
test/support/less.patch | 9 +++++++--
6 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/_jekyll/select2-bootstrap.css b/_jekyll/select2-bootstrap.css
index 24c7cf1..13e3b9d 100644
--- a/_jekyll/select2-bootstrap.css
+++ b/_jekyll/select2-bootstrap.css
@@ -71,6 +71,10 @@
border-color: rgba(82, 168, 236, 0.8);
border-color: #ccc\0;
outline: none;
+}
+
+.select2-container-active .select2-choice,
+.select2-container-multi.select2-container-active .select2-choices {
-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);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
diff --git a/docs/select2-bootstrap.css b/docs/select2-bootstrap.css
index 24c7cf1..13e3b9d 100644
--- a/docs/select2-bootstrap.css
+++ b/docs/select2-bootstrap.css
@@ -71,6 +71,10 @@
border-color: rgba(82, 168, 236, 0.8);
border-color: #ccc\0;
outline: none;
+}
+
+.select2-container-active .select2-choice,
+.select2-container-multi.select2-container-active .select2-choices {
-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);
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.less b/lib/select2-bootstrap.less
index bcd7b9f..2279644 100644
--- a/lib/select2-bootstrap.less
+++ b/lib/select2-bootstrap.less
@@ -56,6 +56,10 @@
border-color: rgba(82, 168, 236, 0.8);
border-color: #ccc\0;
outline: none;
+}
+
+.select2-container-active .select2-choice,
+.select2-container-multi.select2-container-active .select2-choices {
.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 8f6960b..f2dccc8 100644
--- a/lib/select2-bootstrap.scss
+++ b/lib/select2-bootstrap.scss
@@ -56,6 +56,10 @@
border-color: rgba(82, 168, 236, 0.8);
border-color: #ccc\0;
outline: none;
+}
+
+.select2-container-active .select2-choice,
+.select2-container-multi.select2-container-active .select2-choices {
@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 24c7cf1..13e3b9d 100644
--- a/select2-bootstrap.css
+++ b/select2-bootstrap.css
@@ -71,6 +71,10 @@
border-color: rgba(82, 168, 236, 0.8);
border-color: #ccc\0;
outline: none;
+}
+
+.select2-container-active .select2-choice,
+.select2-container-multi.select2-container-active .select2-choices {
-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);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
diff --git a/test/support/less.patch b/test/support/less.patch
index d97eba4..2579cfa 100644
--- a/test/support/less.patch
+++ b/test/support/less.patch
@@ -34,7 +34,7 @@ Index: select2-bootstrap.css
* Select2 Bootstrap CSS v1.2.4
* Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
-@@ -30,42 +57,38 @@
+@@ -30,85 +57,73 @@
.select2-container[class*="span"] {
float: none;
margin-left: 0;
@@ -81,7 +81,12 @@ Index: select2-bootstrap.css
.select2-container-active .select2-choice,
.select2-container-multi.select2-container-active .select2-choices {
border-color: rgba(82, 168, 236, 0.8);
-@@ -74,37 +97,30 @@
+ border-color: #ccc\0;
+ outline: none;
+ }
+-
+ .select2-container-active .select2-choice,
+ .select2-container-multi.select2-container-active .select2-choices {
-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);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
From bf1ef7c393fc022e631f66a2f5895769c724b139 Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Wed, 1 Apr 2015 04:40:55 +0200
Subject: [PATCH 10/12] Release v1.2.5.
---
_jekyll/select2-bootstrap.css | 2 +-
bower.json | 2 +-
docs/select2-bootstrap.css | 2 +-
lib/select2-bootstrap.less | 2 +-
lib/select2-bootstrap.scss | 2 +-
lib/select2-bootstrap/version.rb | 2 +-
package.json | 2 +-
select2-bootstrap.css | 2 +-
test/support/less.patch | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/_jekyll/select2-bootstrap.css b/_jekyll/select2-bootstrap.css
index 13e3b9d..e2ebdb7 100644
--- a/_jekyll/select2-bootstrap.css
+++ b/_jekyll/select2-bootstrap.css
@@ -1,5 +1,5 @@
/**
- * Select2 Bootstrap CSS v1.2.4
+ * Select2 Bootstrap CSS v1.2.5
* Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
*/
diff --git a/bower.json b/bower.json
index 4e591df..e811fe9 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "select2-bootstrap-css",
- "version": "1.2.4",
+ "version": "1.2.5",
"main": [
"select2-bootstrap.css"
],
diff --git a/docs/select2-bootstrap.css b/docs/select2-bootstrap.css
index 13e3b9d..e2ebdb7 100644
--- a/docs/select2-bootstrap.css
+++ b/docs/select2-bootstrap.css
@@ -1,5 +1,5 @@
/**
- * Select2 Bootstrap CSS v1.2.4
+ * Select2 Bootstrap CSS v1.2.5
* Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
*/
diff --git a/lib/select2-bootstrap.less b/lib/select2-bootstrap.less
index 2279644..979a4cb 100644
--- a/lib/select2-bootstrap.less
+++ b/lib/select2-bootstrap.less
@@ -1,5 +1,5 @@
/**
- * Select2 Bootstrap CSS v1.2.4
+ * Select2 Bootstrap CSS v1.2.5
* Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
*/
diff --git a/lib/select2-bootstrap.scss b/lib/select2-bootstrap.scss
index f2dccc8..76ca5d4 100644
--- a/lib/select2-bootstrap.scss
+++ b/lib/select2-bootstrap.scss
@@ -1,5 +1,5 @@
/**
- * Select2 Bootstrap CSS v1.2.4
+ * Select2 Bootstrap CSS v1.2.5
* Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
*/
diff --git a/lib/select2-bootstrap/version.rb b/lib/select2-bootstrap/version.rb
index 8a1a1b6..eebd25c 100644
--- a/lib/select2-bootstrap/version.rb
+++ b/lib/select2-bootstrap/version.rb
@@ -2,7 +2,7 @@ module Select2
module Bootstrap
# This is updated via the `grunt bump` command, which has a pretty
# unflexible matching syntax.
- VERSION_STRING = "'version': '1.2.4'"
+ VERSION_STRING = "'version': '1.2.5'"
# Then, just the version.
VERSION = VERSION_STRING.match(/\d+\.\d+\.\d+/)[0]
end
diff --git a/package.json b/package.json
index 108e561..f993cea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "select2-bootstrap-css",
- "version": "1.2.4",
+ "version": "1.2.5",
"description": "simple css to make select2 widgets fit in with bootstrap",
"main": "",
"directories": {
diff --git a/select2-bootstrap.css b/select2-bootstrap.css
index 13e3b9d..e2ebdb7 100644
--- a/select2-bootstrap.css
+++ b/select2-bootstrap.css
@@ -1,5 +1,5 @@
/**
- * Select2 Bootstrap CSS v1.2.4
+ * Select2 Bootstrap CSS v1.2.5
* Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
*/
diff --git a/test/support/less.patch b/test/support/less.patch
index 2579cfa..1fe81fc 100644
--- a/test/support/less.patch
+++ b/test/support/less.patch
@@ -31,7 +31,7 @@ Index: select2-bootstrap.css
+ box-sizing: border-box;
+}
/**
- * Select2 Bootstrap CSS v1.2.4
+ * Select2 Bootstrap CSS v1.2.5
* Tested with Bootstrap v2.3.1, v2.3.2 and Select2 v3.3.2, v3.4.1
* MIT License
@@ -30,85 +57,73 @@
From eea5a30b4c140ba018856e59cbb61443b1c1f079 Mon Sep 17 00:00:00 2001
From: Tom Terrace
Date: Fri, 27 May 2016 14:19:05 -0400
Subject: [PATCH 11/12] Add pointer to official repo in readme.md
---
README.md | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 9792004..edeefab 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,15 @@
# Select2 Bootstrap CSS
Simple CSS to make Select2 widgets fit in with Bootstrap.
-*This branch (`master`) contains the legacy version for Bootstrap 2.
-If you are looking for the Bootstrap 3 version, please head over to the [`bootstrap3` branch](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3).*
+
+* NOTE: This is the original legacy repo. You probably want the official one here: https://github.com/select2/select2-bootstrap-theme
+
+--------------------------------------------------
+
+
+
+* This branch (`master`) contains the legacy version for Bootstrap 2.
+* The legacy bootstrap 3 branch is here: [`bootstrap3` branch](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3).*
The LESS file is located at lib/select2-bootstrap.less, and the SCSS file is located at lib/select2-bootstrap.scss.
From 1855431d073b3f047381ac1427f2a44c4ba18266 Mon Sep 17 00:00:00 2001
From: Tom Terrace
Date: Fri, 27 May 2016 14:19:44 -0400
Subject: [PATCH 12/12] typo
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index edeefab..63e4837 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
Simple CSS to make Select2 widgets fit in with Bootstrap.
-* NOTE: This is the original legacy repo. You probably want the official one here: https://github.com/select2/select2-bootstrap-theme
+* NOTE: This is the legacy repo. You probably want the official one here: https://github.com/select2/select2-bootstrap-theme
--------------------------------------------------