Merge pull request #96 from izifortune/default-sass

added support for !default for the sass variables
This commit is contained in:
Shockwork 2014-10-06 19:19:41 +02:00
commit fea7818300

View File

@ -3,30 +3,30 @@
// Material colors palette // Material colors palette
$red: #F44336; $red: #F44336 !default;
$pink: #E91E63; $pink: #E91E63 !default;
$purple: #9C27B0; $purple: #9C27B0 !default;
$deeppurple: #673AB7; $deeppurple: #673AB7 !default;
$indigo: #3F51B5; $indigo: #3F51B5 !default;
$lightblue: #03A9F4; $lightblue: #03A9F4 !default;
$cyan: #00BCD4; $cyan: #00BCD4 !default;
$teal: #009688; $teal: #009688 !default;
$lightgreen: #8BC34A; $lightgreen: #8BC34A !default;
$lime: #CDDC39; $lime: #CDDC39 !default;
$lightyellow: #FFEB3B; $lightyellow: #FFEB3B !default;
$orange: #FF9800; $orange: #FF9800 !default;
$deeporange: #FF5722; $deeporange: #FF5722 !default;
$grey: #9E9E9E; $grey: #9E9E9E !default;
$bluegrey: #607D8B; $bluegrey: #607D8B !default;
$brown: #795548; $brown: #795548 !default;
$lightgrey: #ECECEC; $lightgrey: #ECECEC !default;
// Bootstrap shades // Bootstrap shades
$primary: #4285F4; $primary: #4285F4 !default;
$success: #0F9D58; $success: #0F9D58 !default;
$info: $lightblue; $info: $lightblue !default;
$warning: $deeporange; $warning: $deeporange !default;
$danger: $red; $danger: $red !default;
// Typography elements for Material // Typography elements for Material
$darkbg-text: rgba(255,255,255,0.84); $darkbg-text: rgba(255,255,255,0.84);