fix division by 0

ezekg · Sep 16, 2014 · d3a1ff3 · d3a1ff3
1 parent 33849ca
commit d3a1ff3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+### 2.0.0.rc.2 - 9/16/14
+* Fixed issue with `$context` modifiers calling a division by 0.
+
 ### 2.0.0.rc.1 - 9/12/14
 * Revamped codebase considerably.
 * Modified layout of `$flint` configuration map. Breakpoints are now housed in their own separate section.

diff --git a/lib/flint.rb b/lib/flint.rb
@@ -10,7 +10,7 @@
 end
 
 module Flint
-    VERSION = "2.0.0.rc.2"
+    VERSION = "2.0.0.rc.3"
     DATE = "2014-09-16"
 end
 

diff --git a/stylesheets/flint/mixins/lib/_calculate.scss b/stylesheets/flint/mixins/lib/_calculate.scss
@@ -17,8 +17,8 @@
 
 	@if flint-get-value("settings", "grid") == "fluid" {
 		width: flint-fluid-width(map-get($width, "target"), map-get($width, "context"));
-		margin-right: flint-fluid-width($margin-right, map-get($width, "context"));
-		margin-left: flint-fluid-width($margin-left, map-get($width, "context"));
+		margin-right: if($margin-right != 0, flint-fluid-width($margin-right, map-get($width, "context")), 0);
+		margin-left: if($margin-left != 0, flint-fluid-width($margin-left, map-get($width, "context")), 0);
 	} @else {
 		width: map-get($width, "target");
 		margin-right: $margin-right;