From c7bd43308acb91acea9936954461723b1fddf66f Mon Sep 17 00:00:00 2001
From: Sean Mulvenna <smulvenna@gcdtech.com>
Date: Fri, 23 Jan 2015 14:24:40 +0000
Subject: [PATCH] Removed extends and includes from grid mixins

---
 grid/_grid-fillparent.scss   | 13 ++-----------
 grid/_grid-fraction.scss     |  9 ++++-----
 grid/_grid-item-padding.scss | 20 +++++---------------
 grid/_grid-item.scss         | 17 ++++-------------
 grid/_grid-row-divs.scss     | 11 +++++------
 grid/_grid-row.scss          | 23 +++++++----------------
 6 files changed, 27 insertions(+), 66 deletions(-)

diff --git a/grid/_grid-fillparent.scss b/grid/_grid-fillparent.scss
index 9991892..c048be5 100644
--- a/grid/_grid-fillparent.scss
+++ b/grid/_grid-fillparent.scss
@@ -3,15 +3,6 @@
 */
 
 @mixin grid-fillparent($include: extend) {
-	@if $include != "extend" {
-		float:none;
-		width:auto;
-	}
-	@else {
-		@extend %grid-fillparent;
-	}
-}
-
-%grid-fillparent {
-	@include grid-fillparent(include);
+	float:none;
+	width:100%;
 }
diff --git a/grid/_grid-fraction.scss b/grid/_grid-fraction.scss
index d0c77fb..cdbb6be 100644
--- a/grid/_grid-fraction.scss
+++ b/grid/_grid-fraction.scss
@@ -7,17 +7,16 @@
 */
 @mixin grid-fraction(
 $n,
-$d,
-$include:extend
+$d
 ) {
 	@include is-old-ie {
 		.ie-inner {
-			@include grid-item-padding($include);
+			@include grid-item-padding;
 		}
 	}
 	@include is-not-old-ie {
-		@include grid-item-padding($include);
+		@include grid-item-padding;
 	}
-	@include grid-item($include);
+	@include grid-item;
 	@include fraction($n, $d);
 }
\ No newline at end of file
diff --git a/grid/_grid-item-padding.scss b/grid/_grid-item-padding.scss
index 3531c27..f989bde 100644
--- a/grid/_grid-item-padding.scss
+++ b/grid/_grid-item-padding.scss
@@ -1,15 +1,5 @@
-@mixin grid-item-padding($include: extend) {
-	@if $include != "extend" {
-		@include border-box(include);
-		@include rem(padding-left, $gutter/2);
-		@include rem(padding-right, $gutter/2);
-	}
-	@else {
-		@include border-box;
-		@extend %grid-item-padding;
-	}
-}
-
-%grid-item-padding {
-	@include grid-item-padding(include);
-}
+@mixin grid-item-padding($gutter:$gutter) {
+	@include border-box(include);
+	@include rem(padding-left, $gutter/2);
+	@include rem(padding-right, $gutter/2);
+}
\ No newline at end of file
diff --git a/grid/_grid-item.scss b/grid/_grid-item.scss
index df11ec9..d05eb9f 100644
--- a/grid/_grid-item.scss
+++ b/grid/_grid-item.scss
@@ -1,13 +1,4 @@
-@mixin grid-item($include: extend) {
-	@if $include != "extend" {
-		@include collapse-fix($include);
-		float:$main-start;
-	}
-	@else {
-		@extend %grid-item;
-	}
-}
-
-%grid-item {
-	@include grid-item(include);
-}
+@mixin grid-item {
+	min-height: 1px;
+	float:$main-start;
+}
\ No newline at end of file
diff --git a/grid/_grid-row-divs.scss b/grid/_grid-row-divs.scss
index 8f9fcc4..0b3e13a 100644
--- a/grid/_grid-row-divs.scss
+++ b/grid/_grid-row-divs.scss
@@ -6,23 +6,22 @@
 * can split it's content into equal sections in the grid.
 */
 @mixin grid-row-divs(
-$n:1,
-$include:extend
+$n:1
 ) {
-	@include grid-row(include);
+	@include grid-row;
 	@if $n > 1 {
 		@include divisions($n);
 
 		&> * {
 			@include is-old-ie {
 				.ie-inner {
-					@include grid-item-padding($include);
+					@include grid-item-padding;
 				}
 			}
 			@include is-not-old-ie {
-				@include grid-item-padding($include);
+				@include grid-item-padding;
 			}
-			@include grid-item($include);
+			@include grid-item;
 		}
 	}
 }
diff --git a/grid/_grid-row.scss b/grid/_grid-row.scss
index 412691f..e01d784 100644
--- a/grid/_grid-row.scss
+++ b/grid/_grid-row.scss
@@ -1,20 +1,11 @@
 /**
 * Used to contain a number of grid items, adds negative margins to the left and right
 */
-@mixin grid-row($include: extend) {
-	@if $include != "extend" {
-		@include clear(include);
-		@include margin(n (-$gutter/2));
-		@include is-old-ie {
-			@include margin(n (-$gutter));
-			position:relative;
-		}
+@mixin grid-row($gutter:$gutter) {
+	@include clear(include);
+	@include margin(n (-$gutter/2));
+	@include is-old-ie {
+		@include margin(n (-$gutter));
+		position:relative;
 	}
-	@else {
-		@extend %grid-row;
-	}
-}
-
-%grid-row {
-	@include grid-row(include);
-}
+}
\ No newline at end of file