Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bower.jsons "main" field, make Sass variables overwritable via !default #45

Merged
merged 1 commit into from
Jun 29, 2016
Merged

Fix bower.jsons "main" field, make Sass variables overwritable via !default #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
"**/.*",
Expand Down
6 changes: 3 additions & 3 deletions src/select2-bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
// -------------------------
Expand Down