Merge branch 'master' into 1.0.3

dmitry-lavrik · Mar 24, 2017 · 13fd6e4 · 13fd6e4
2 parents 9e41b3b + e9dce19
commit 13fd6e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "smart-grid",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Smart CSS Grid with different preprocessors: LESS, SCSS, SASS or Stylus",
   "main": "index.js",
   "dependencies": {},

diff --git a/system/base.js b/system/base.js
@@ -7,12 +7,12 @@ function Base(resources) {
         row: {
             display: "flex",
             'flex-wrap': "wrap",
-            'margin-left': "{{var}}offset_one_side",
-            'margin-right': "{{var}}offset_one_side"
+            'margin-left': "({{var}}offset_one_side * -1)",
+            'margin-right': "({{var}}offset_one_side * -1)"
         },
         rowFloat: {
-            'margin-left': "{{var}}offset_one_side",
-            'margin-right': "{{var}}offset_one_side",
+            'margin-left': "({{var}}offset_one_side * -1)",
+            'margin-right': "({{var}}offset_one_side * -1)",
             '{{call}}clearfix()': null,
         },
         column: {