Merge pull request gridstack#319 from rharriso/master

troolee · troolee · commit 928d9d367985 · 2016-02-10T19:01:20.000-08:00
allow default sass values to be overridden
diff --git a/src/gridstack-extra.scss b/src/gridstack-extra.scss
@@ -1,4 +1,4 @@
-$gridstack-columns: 12;
+$gridstack-columns: 12 !default;
 
 @mixin grid-stack-items($gridstack-columns) {
     .grid-stack.grid-stack-#{$gridstack-columns} {
diff --git a/src/gridstack.scss b/src/gridstack.scss
@@ -1,7 +1,7 @@
-$gridstack-columns: 12;
-$horizontal_padding: 20px;
-$vertical_padding: 20px;
-$animation_speed: .3s;
+$gridstack-columns: 12 !default;
+$horizontal_padding: 20px !default;
+$vertical_padding: 20px !default;
+$animation_speed: .3s !default;
 
 @mixin vendor($property, $value...){
     -webkit-#{$property}:$value;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-$gridstack-columns: 12;`
	`1`	`+$gridstack-columns: 12 !default;`
`2`	`2`
`3`	`3`	`@mixin grid-stack-items($gridstack-columns) {`
`4`	`4`	`.grid-stack.grid-stack-#{$gridstack-columns} {`