Merge pull request #45 from kalidema/master

Fix bower.jsons "main" field, make Sass variables overwritable via `!default`.
select2 · Jun 29, 2016 · 1ef8ee2 · 1ef8ee2
2 parents e57cdde + 494123d
commit 1ef8ee2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -2,8 +2,8 @@
   "name": "select2-bootstrap-theme",
   "version": "0.1.0-beta.7",
   "main": [
-    "dist/select2-bootstrap.css",
-    "dist/select2-bootstrap.min.css"
+    "src/build.scss",
+    "src/build.less"
   ],
   "ignore": [
     "**/.*",

diff --git a/src/select2-bootstrap.scss b/src/select2-bootstrap.scss
@@ -8,13 +8,13 @@
 // These should not be overridden.
 // @see https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_forms.scss#L127
 
-$form-control-default-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+$form-control-default-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !default;
 
 // @see https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/mixins/_forms.scss#L43
-$form-control-focus-box-shadow: $form-control-default-box-shadow, 0 0 8px rgba($input-border-focus, 0.6);
+$form-control-focus-box-shadow: $form-control-default-box-shadow, 0 0 8px rgba($input-border-focus, 0.6) !default;
 
 // @see https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_forms.scss#L128
-$form-control-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+$form-control-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s !default;
 
 // Custom variables
 // -------------------------