Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Changed space-before and -after to margin-before and -after.

  • Loading branch information...
commit 193bb9f9d6082a086734499f11501d57fd9ebdc3 1 parent d15d269
John Ferris authored

Showing 1 changed file with 11 additions and 11 deletions. Show diff stats Hide diff stats

  1. +11 11 stylesheets/zen/_grids.scss
22 stylesheets/zen/_grids.scss
@@ -87,8 +87,8 @@ $zen-reverse-all-floats: false !default;
87 87 ) {
88 88
89 89 $width: 0;
90   - $space-before: 0;
91   - $space-after: 0;
  90 + $margin-before: 0;
  91 + $margin-after: 0;
92 92
93 93 // If $columns is a list, add up the appropriate column widths.
94 94 @if type-of($columns) == "list" {
@@ -98,19 +98,19 @@ $zen-reverse-all-floats: false !default;
98 98 $column-position
99 99 );
100 100
101   - // Calculate the space before the grid-item.
  101 + // Calculate the margin before the grid-item.
102 102 @if $column-position == 1 {
103   - $space-before: 0;
  103 + $margin-before: 0;
104 104 }
105 105 @else {
106   - $space-before: zen-asymetric-grid-width(
  106 + $margin-before: zen-asymetric-grid-width(
107 107 $column-position - 1,
108 108 1
109 109 );
110 110 }
111 111
112   - // Calculate the space after the grid-item.
113   - $space-after: 0 - $width - $space-before;
  112 + // Calculate the margin after the grid-item.
  113 + $margin-after: 0 - $width - $margin-before;
114 114
115 115 // Display a warning if units are % and add up to more than 100%.
116 116 @if unit($width) == "%" {
@@ -131,8 +131,8 @@ $zen-reverse-all-floats: false !default;
131 131 }
132 132
133 133 $width: $column-span * $unit-width;
134   - $space-before: ($column-position - 1) * $unit-width;
135   - $space-after: (1 - $column-position - $column-span) * $unit-width;
  134 + $margin-before: ($column-position - 1) * $unit-width;
  135 + $margin-after: (1 - $column-position - $column-span) * $unit-width;
136 136 }
137 137
138 138 // Determine the float direction and its reverse.
@@ -153,8 +153,8 @@ $zen-reverse-all-floats: false !default;
153 153 }
154 154 width: $width;
155 155 margin: {
156   - #{$dir}: $space-before;
157   - #{$rev}: $space-after;
  156 + #{$dir}: $margin-before;
  157 + #{$rev}: $margin-after;
158 158 }
159 159
160 160 // Auto-apply the unit base mixin.

0 comments on commit 193bb9f

Please sign in to comment.
Something went wrong with that request. Please try again.