groundworkcss 2.3.3 → 2.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/app/assets/stylesheets/groundworkcss/_settings.scss +0 -1
  2. data/app/assets/stylesheets/groundworkcss/base/_grid.scss +26 -56
  3. data/lib/groundworkcss/version.rb +1 -1
  4. metadata +2 -2
data/app/assets/stylesheets/groundworkcss/_settings.scss CHANGED
@@ -169,7 +169,6 @@
169
169
  // $grid-classes: true;
170
170
  // $grid-adapter-classes: true;
171
171
  // $grid-adapters: $one-whole $one-half $one-third $one-fourth $one-fifth;
172
- // $grid-adapters-clearfix: 15;
173
172
  // $container-width: 1200px;
174
173
  // $gutter: 10px;
175
174
  // $responsive: true;
data/app/assets/stylesheets/groundworkcss/base/_grid.scss CHANGED
@@ -12,7 +12,6 @@ $denominators-plural: "wholes" "halves" "thirds" "fourths" "fifths" "sixths"
12
12
  $grid-classes: true !default;
13
13
  $grid-adapter-classes: true !default;
14
14
  $grid-adapters: $one-whole $one-half $one-third $one-fourth $one-fifth !default;
15
- $grid-adapters-clearfix: 15 !default;
16
15
  $container-width: 1200px !default;
17
16
  $gutter: 10px !default;
18
17
  $responsive: true !default;
@@ -89,30 +88,22 @@ $selectors: if($grid-classes, "%" ".", "%");
89
88
  }
90
89
 
91
90
  @if $grid-adapter-classes {
92
- @media #{$tablet} {
93
- // grid adapters
94
- @for $i from 1 through length($grid-adapters) {
95
- .#{nth($numerators, ($i))}-up {
96
- width: nth($grid-adapters, $i) !important;
97
- clear: none !important;
98
- float: left !important;
99
- left: 0 !important;
100
- right: 0 !important;
101
- }
91
+ @for $i from 1 through length($grid-adapters) {
92
+ .#{nth($numerators, $i)}-up,
93
+ .#{nth($numerators, $i)}-up-desktop {
94
+ width: nth($grid-adapters, $i) !important;
95
+ clear: none !important;
96
+ float: left !important;
97
+ left: 0 !important;
98
+ right: 0 !important;
102
99
  }
103
- // grid adapters nth clearfix
104
- @for $i from 1 through length($grid-adapters) {
105
- $nth-clears: "";
106
- @for $j from 1 through $grid-adapters-clearfix {
107
- $nth-clears: $nth-clears + "&:nth-child(#{($i * $j) + 1})";
108
- @if $j < $grid-adapters-clearfix {
109
- $nth-clears: $nth-clears + ", ";
110
- }
111
- }
112
- .#{nth($numerators, ($i))}-up {
113
- #{$nth-clears} {
114
- clear: both !important;
115
- }
100
+ }
101
+ // grid adapters nth clearfix
102
+ @for $i from 1 through length($grid-adapters) {
103
+ .#{nth($numerators, $i)}-up,
104
+ .#{nth($numerators, $i)}-up-desktop {
105
+ &:nth-child(#{$i}n+1) {
106
+ clear: both !important;
116
107
  }
117
108
  }
118
109
  }
@@ -122,7 +113,7 @@ $selectors: if($grid-classes, "%" ".", "%");
122
113
  // ipad grid adapters
123
114
  @media #{$ipad} {
124
115
  @for $i from 1 through length($grid-adapters) {
125
- .#{nth($numerators, ($i))}-up-ipad {
116
+ .#{nth($numerators, $i)}-up-ipad {
126
117
  width: nth($grid-adapters, $i) !important;
127
118
  clear: none !important;
128
119
  float: left !important;
@@ -134,15 +125,8 @@ $selectors: if($grid-classes, "%" ".", "%");
134
125
  // ipad grid adapters nth clearfix
135
126
  @media #{$ipad} and #{$tablet} and #{$not-mobile} {
136
127
  @for $i from 1 through length($grid-adapters) {
137
- $nth-clears: "";
138
- @for $j from 1 through $grid-adapters-clearfix {
139
- $nth-clears: $nth-clears + "&:nth-child(#{($i * $j) + 1})";
140
- @if $j < $grid-adapters-clearfix {
141
- $nth-clears: $nth-clears + ", ";
142
- }
143
- }
144
- .#{nth($numerators, ($i))}-up-ipad {
145
- #{$nth-clears} {
128
+ .#{nth($numerators, $i)}-up-ipad {
129
+ &:nth-child(#{$i}n+1) {
146
130
  clear: both !important;
147
131
  }
148
132
  }
@@ -151,7 +135,7 @@ $selectors: if($grid-classes, "%" ".", "%");
151
135
  // small-tablet grid adapters
152
136
  @media #{$small-tablet} and #{$not-mobile} {
153
137
  @for $i from 1 through length($grid-adapters) {
154
- .#{nth($numerators, ($i))}-up-small-tablet {
138
+ .#{nth($numerators, $i)}-up-small-tablet {
155
139
  width: nth($grid-adapters, $i) !important;
156
140
  clear: none !important;
157
141
  float: left !important;
@@ -163,15 +147,8 @@ $selectors: if($grid-classes, "%" ".", "%");
163
147
  // small-tablet grid adapters nth clearfix
164
148
  @media #{$small-tablet} and #{$not-mobile} {
165
149
  @for $i from 1 through length($grid-adapters) {
166
- $nth-clears: "";
167
- @for $j from 1 through $grid-adapters-clearfix {
168
- $nth-clears: $nth-clears + "&:nth-child(#{($i * $j) + 1})";
169
- @if $j < $grid-adapters-clearfix {
170
- $nth-clears: $nth-clears + ", ";
171
- }
172
- }
173
- .#{nth($numerators, ($i))}-up-small-tablet {
174
- #{$nth-clears} {
150
+ .#{nth($numerators, $i)}-up-small-tablet {
151
+ &:nth-child(#{$i}n+1) {
175
152
  clear: both !important;
176
153
  }
177
154
  }
@@ -180,7 +157,7 @@ $selectors: if($grid-classes, "%" ".", "%");
180
157
  // mobile grid adapters
181
158
  @media #{$mobile} {
182
159
  @for $i from 1 through length($grid-adapters) {
183
- .#{nth($numerators, ($i))}-up-mobile {
160
+ .#{nth($numerators, $i)}-up-mobile {
184
161
  width: nth($grid-adapters, $i) !important;
185
162
  clear: none !important;
186
163
  float: left !important;
@@ -195,15 +172,8 @@ $selectors: if($grid-classes, "%" ".", "%");
195
172
  // mobile grid adapters nth clearfix
196
173
  @media #{$mobile} {
197
174
  @for $i from 1 through length($grid-adapters) {
198
- $nth-clears: "";
199
- @for $j from 1 through $grid-adapters-clearfix {
200
- $nth-clears: $nth-clears + "&:nth-child(#{($i * $j) + 1})";
201
- @if $j < $grid-adapters-clearfix {
202
- $nth-clears: $nth-clears + ", ";
203
- }
204
- }
205
- .#{nth($numerators, ($i))}-up-mobile {
206
- #{$nth-clears} {
175
+ .#{nth($numerators, $i)}-up-mobile {
176
+ &:nth-child(#{$i}n+1) {
207
177
  clear: both !important;
208
178
  }
209
179
  }
@@ -216,7 +186,7 @@ $selectors: if($grid-classes, "%" ".", "%");
216
186
  $nots: ':not(.mobile)'; // set up mobile nots
217
187
  @if $grid-adapter-classes {
218
188
  @for $i from 1 through length($grid-adapters) {
219
- $nots: $nots + ':not(.' + unquote("#{nth($numerators, ($i))}") + '-up-mobile)';
189
+ $nots: $nots + ':not(.' + unquote("#{nth($numerators, $i)}") + '-up-mobile)';
220
190
  }
221
191
  }
222
192
  %responsive-grid#{$both} { // reset grid
@@ -239,7 +209,7 @@ $selectors: if($grid-classes, "%" ".", "%");
239
209
  $nots: $nots + ':not(.small-tablet)'; // setup tablet $nots
240
210
  @if $grid-adapter-classes {
241
211
  @for $i from 1 through length($grid-adapters) {
242
- $nots: $nots + ':not(.' + unquote("#{nth($numerators, ($i))}") + '-up-small-tablet)';
212
+ $nots: $nots + ':not(.' + unquote("#{nth($numerators, $i)}") + '-up-small-tablet)';
243
213
  }
244
214
  }
245
215
  }
data/lib/groundworkcss/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Groundworkcss
2
- VERSION = "2.3.3"
2
+ VERSION = "2.3.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: groundworkcss
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.3
4
+ version: 2.3.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-10-03 00:00:00.000000000 Z
13
+ date: 2013-10-04 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: colorize