Skip to content

Commit

Permalink
Merge pull request #15 from emolr/master
Browse files Browse the repository at this point in the history
Adding missing !default in sass variables
  • Loading branch information
davidchin committed Feb 16, 2016
2 parents 4fe63e1 + d4a0d47 commit 2b7a5f6
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions scss/_InputRangeVariables.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
$InputRange-fontFamily: 'Helvetica Neue', san-serif;
$InputRange-primaryColor: #3f51b5;
$InputRange-neutralColor: #aaaaaa;
$InputRange-neutralLightColor: #eeeeee;
$InputRange-disabledColor: #cccccc;
$InputRange-fontFamily: 'Helvetica Neue', san-serif !default;
$InputRange-primaryColor: #3f51b5 !default;
$InputRange-neutralColor: #aaaaaa !default;
$InputRange-neutralLightColor: #eeeeee !default;
$InputRange-disabledColor: #cccccc !default;

// InputRange-slider
$InputRange-slider-background: $InputRange-primaryColor !default;
$InputRange-slider-border: 1px solid $InputRange-primaryColor !default;
$InputRange-slider-height: 1rem !default;
$InputRange-slider-width: 1rem !default;
$InputRange-slider-transition: transform 0.3s ease-out, box-shadow 0.3s ease-out;
$InputRange-sliderContainer-transition: left 0.3s ease-out;
$InputRange-slider-transition: transform 0.3s ease-out, box-shadow 0.3s ease-out !default;
$InputRange-sliderContainer-transition: left 0.3s ease-out !default;
$InputRange-slider--active-transform: scale(1.3) !default;
$InputRange-slider--is-disabled-background: $InputRange-disabledColor !default;
$InputRange-slider--is-disabled-border: 1px solid $InputRange-disabledColor !default;
Expand All @@ -21,6 +21,6 @@ $InputRange-label-color: $InputRange-neutralColor !default;
// InputRange-track
$InputRange-track-background: $InputRange-neutralLightColor !default;
$InputRange-track-height: 0.3rem !default;
$inputRange-track-transition: left 0.3s ease-out, width 0.3s ease-out;
$inputRange-track-transition: left 0.3s ease-out, width 0.3s ease-out !default;
$InputRange-track--active-background: $InputRange-primaryColor !default;
$InputRange-track--is-disabled-background: $InputRange-neutralLightColor !default;

3 comments on commit 2b7a5f6

@emolr
Copy link
Contributor

@emolr emolr commented on 2b7a5f6 Feb 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! Thank ou for merging my PR :)
I'm sorry to bother you, but do you plan on making a new release?

All the best,

@davidchin
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@emolr
Copy link
Contributor

@emolr emolr commented on 2b7a5f6 Feb 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @davidchin :)

Please sign in to comment.