Merge pull request #319 from rharriso/master

allow default sass values to be overridden
gridstack · Feb 11, 2016 · 928d9d3 · 928d9d3
2 parents 44ed26d + c679b26
commit 928d9d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
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;