v1.3.5 - fix snapappointments#285, fix snapappointments#312

Improve bootstrap 3 support
llopeziii · Oct 10, 2013 · 32ca0b3 · 32ca0b3
1 parent f1a1a24
commit 32ca0b3
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/bootstrap-select.css b/bootstrap-select.css
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-select v1.3.4
+ * bootstrap-select v1.3.5
  * http:https://silviomoreto.github.io/bootstrap-select/
  *
  * Copyright 2013 bootstrap-select
@@ -24,10 +24,6 @@
  border: none;
 }
 
-.bootstrap-select.form-control:not([class*="span"]) {
- width: 100%;
-}
-
 .bootstrap-select.btn-group.pull-right,
 .bootstrap-select.btn-group[class*="span"].pull-right,
 .row-fluid .bootstrap-select.btn-group[class*="span"].pull-right {
@@ -42,7 +38,7 @@
  margin-right: -1px;
 }
 
-.bootstrap-select:not([class*="span"]) {
+.bootstrap-select:not([class*="span"]):not([class*="col-"]):not([class*="form-control"]) {
  width: 220px;
 }
 
@@ -51,6 +47,10 @@
  width: 220px\0; /*IE9 and below*/
 }
 
+.bootstrap-select.form-control:not([class*="span"]) {
+ width: 100%;
+}
+
 .bootstrap-select > .btn {
  width: 100%;
 }
@@ -263,4 +263,4 @@
 
 .bootstrap-select-searchbox {
  padding: 4px 8px;
-}
+}
diff --git a/bootstrap-select.jquery.json b/bootstrap-select.jquery.json
@@ -8,7 +8,7 @@
  "select",
  "replacement"
  ],
- "version": "1.3.4",
+ "version": "1.3.5",
  "author": {
  "name": "Silvio Moreto",
  "url": "https://github.com/silviomoreto/"

diff --git a/bootstrap-select.js b/bootstrap-select.js
@@ -1,5 +1,5 @@
 /*!
- * bootstrap-select v1.3.4
+ * bootstrap-select v1.3.5
  * http:https://silviomoreto.github.io/bootstrap-select/
  *
  * Copyright 2013 bootstrap-select
@@ -82,7 +82,7 @@
  createDropdown: function() {
  //If we are multiple, then add the show-tick class by default
  var multiple = this.multiple ? ' show-tick' : '';
- var header = this.options.header ? '<h3 class="popover-title">' + this.options.header + '<button type="button" class="close" aria-hidden="true">&times;</button></h3>' : '';
+ var header = this.options.header ? '<div class="popover-title"><button type="button" class="close" aria-hidden="true">&times;</button>' + this.options.header + '</div>' : '';
  var searchbox = this.options.liveSearch ? '<div class="bootstrap-select-searchbox"><input type="text" class="input-block-level form-control" /></div>' : '';
  var drop =
  "<div class='btn-group bootstrap-select" + multiple + "'>" +

diff --git a/bootstrap-select.min.css b/bootstrap-select.min.css