From 494123dbaa0d08311fc908ba1d0a04da6f81c168 Mon Sep 17 00:00:00 2001 From: kalidema Date: Tue, 28 Jun 2016 17:09:30 +0200 Subject: [PATCH] Two problems that can be eliminated very easily. --- bower.json | 4 ++-- src/select2-bootstrap.scss | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index d8daf1c..04f3e15 100755 --- 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 index 62ba8f5..64982d6 100755 --- 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 // -------------------------