Fix merge conflict

trevanhetzel · Sep 12, 2014 · 52a7656 · 52a7656
2 parents d2f3091 + ad1ecc8
commit 52a7656
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/css/sass/global/_mixins.scss b/css/sass/global/_mixins.scss
@@ -9,6 +9,9 @@
 	@else if $size == large {
 		@media (min-width: $large) { @content; }
 	}
+	@else {
+		@media (min-width: $size) { @content; }
+	}
 }
 
 // Outline for form :focus states

diff --git a/css/stylus/global/_mixins.styl b/css/stylus/global/_mixins.styl
@@ -15,6 +15,11 @@ breakpoint($size) {
       {block}
     }
   }
+  else {
+    @media (min-width: $size) {
+      {block}
+    }
+  }
 }
 
 // Outline for form focus states

diff --git a/css/stylus/module/_off-canvas.styl b/css/stylus/module/_off-canvas.styl
@@ -38,7 +38,7 @@
 .off-canvas-right {
 	position: fixed;
 	top: 0;
-	width: var($oc-width, 17.5em);;
+	width: var($oc-width, 17.5em);
 	height: 100%;
 	transform: translateZ(0);
 }