Merge pull request #32 from lusini/master

maxmx · maxmx · commit 6e460911f402 · 2013-10-24T10:14:48.000-07:00
fix variable names for make-md-columns in mixins
diff --git a/stylus/mixins.styl b/stylus/mixins.styl
@@ -593,25 +593,25 @@ make-md-column(columns, gutter = $grid-gutter-width) {
   padding-right: (gutter / 2);
 
   // Calculate width based on number of columns available
-  @media $media-min-lg-desktop {
+  @media $media-min-desktop {
     float: left;
     width: percentage(columns, $grid-columns);
   }
 }
 
 // Generate the large column offsets
 make-md-column-offset(columns) {
-  @media $media-min-lg-desktop {
+  @media $media-min-desktop {
     margin-left: percentage(columns, $grid-columns);
   }
 }
 make-md-column-push(columns) {
-  @media $media-min-lg-desktop {
+  @media $media-min-desktop {
     left: percentage(columns, $grid-columns);
   }
 }
 make-md-column-pull(columns) {
-  @media $media-min-lg-desktop {
+  @media $media-min-desktop {
     right: percentage(columns, $grid-columns);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -593,25 +593,25 @@ make-md-column(columns, gutter = $grid-gutter-width) {`
`593`	`593`	`padding-right: (gutter / 2);`
`594`	`594`
`595`	`595`	`// Calculate width based on number of columns available`
`596`		`- @media $media-min-lg-desktop {`
	`596`	`+ @media $media-min-desktop {`
`597`	`597`	`float: left;`
`598`	`598`	`width: percentage(columns, $grid-columns);`
`599`	`599`	`}`
`600`	`600`	`}`
`601`	`601`
`602`	`602`	`// Generate the large column offsets`
`603`	`603`	`make-md-column-offset(columns) {`
`604`		`- @media $media-min-lg-desktop {`
	`604`	`+ @media $media-min-desktop {`
`605`	`605`	`margin-left: percentage(columns, $grid-columns);`
`606`	`606`	`}`
`607`	`607`	`}`
`608`	`608`	`make-md-column-push(columns) {`
`609`		`- @media $media-min-lg-desktop {`
	`609`	`+ @media $media-min-desktop {`
`610`	`610`	`left: percentage(columns, $grid-columns);`
`611`	`611`	`}`
`612`	`612`	`}`
`613`	`613`	`make-md-column-pull(columns) {`
`614`		`- @media $media-min-lg-desktop {`
	`614`	`+ @media $media-min-desktop {`
`615`	`615`	`right: percentage(columns, $grid-columns);`
`616`	`616`	`}`
`617`	`617`	`}`