foundation-rails 5.0.3.1 → 5.1.0.1
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.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/README.md +6 -2
- data/bower.json +7 -0
- data/lib/foundation/rails/version.rb +1 -1
- data/update-gem.sh +13 -0
- data/vendor/assets/javascripts/foundation.js +2 -1
- data/vendor/assets/javascripts/foundation/foundation.abide.js +67 -33
- data/vendor/assets/javascripts/foundation/foundation.accordion.js +19 -11
- data/vendor/assets/javascripts/foundation/foundation.alert.js +8 -5
- data/vendor/assets/javascripts/foundation/foundation.clearing.js +74 -52
- data/vendor/assets/javascripts/foundation/foundation.dropdown.js +52 -46
- data/vendor/assets/javascripts/foundation/foundation.equalizer.js +63 -0
- data/vendor/assets/javascripts/foundation/foundation.interchange.js +47 -26
- data/vendor/assets/javascripts/foundation/foundation.joyride.js +42 -36
- data/vendor/assets/javascripts/foundation/foundation.js +286 -118
- data/vendor/assets/javascripts/foundation/foundation.magellan.js +139 -98
- data/vendor/assets/javascripts/foundation/foundation.offcanvas.js +8 -6
- data/vendor/assets/javascripts/foundation/foundation.orbit.js +29 -21
- data/vendor/assets/javascripts/foundation/foundation.reveal.js +58 -50
- data/vendor/assets/javascripts/foundation/foundation.tab.js +22 -10
- data/vendor/assets/javascripts/foundation/foundation.tooltip.js +38 -26
- data/vendor/assets/javascripts/foundation/foundation.topbar.js +79 -73
- data/vendor/assets/stylesheets/foundation/_functions.scss +37 -18
- data/vendor/assets/stylesheets/foundation/_settings.scss +115 -110
- data/vendor/assets/stylesheets/foundation/components/_block-grid.scss +14 -9
- data/vendor/assets/stylesheets/foundation/components/_breadcrumbs.scss +2 -2
- data/vendor/assets/stylesheets/foundation/components/_button-groups.scss +1 -1
- data/vendor/assets/stylesheets/foundation/components/_clearing.scss +13 -1
- data/vendor/assets/stylesheets/foundation/components/_dropdown-buttons.scss +1 -1
- data/vendor/assets/stylesheets/foundation/components/_flex-video.scss +1 -1
- data/vendor/assets/stylesheets/foundation/components/_forms.scss +23 -29
- data/vendor/assets/stylesheets/foundation/components/_global.scss +23 -54
- data/vendor/assets/stylesheets/foundation/components/_grid.scss +38 -31
- data/vendor/assets/stylesheets/foundation/components/_inline-lists.scss +2 -2
- data/vendor/assets/stylesheets/foundation/components/_joyride.scss +2 -2
- data/vendor/assets/stylesheets/foundation/components/_magellan.scss +2 -2
- data/vendor/assets/stylesheets/foundation/components/_offcanvas.scss +96 -96
- data/vendor/assets/stylesheets/foundation/components/_orbit.scss +3 -0
- data/vendor/assets/stylesheets/foundation/components/_progress-bars.scss +2 -2
- data/vendor/assets/stylesheets/foundation/components/_reveal.scss +8 -3
- data/vendor/assets/stylesheets/foundation/components/_side-nav.scss +10 -5
- data/vendor/assets/stylesheets/foundation/components/_sub-nav.scss +6 -3
- data/vendor/assets/stylesheets/foundation/components/_tabs.scss +2 -0
- data/vendor/assets/stylesheets/foundation/components/_tooltips.scss +11 -1
- data/vendor/assets/stylesheets/foundation/components/_top-bar.scss +20 -7
- data/vendor/assets/stylesheets/foundation/components/_type.scss +82 -4
- data/vendor/assets/stylesheets/foundation/components/_visibility.scss +2 -2
- metadata +5 -2
|
@@ -91,7 +91,7 @@ $button-group-border-width: 1px !default;
|
|
|
91
91
|
&.round > * { @include button-group-style($radius:$button-round, $float:null); }
|
|
92
92
|
|
|
93
93
|
@for $i from 2 through 8 {
|
|
94
|
-
&.even
|
|
94
|
+
&.even-#{$i} li { @include button-group-style($even:$i, $float:null); }
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
|
|
@@ -37,7 +37,7 @@ $clearing-carousel-thumb-active-border: 1px solid rgb(255,255,255) !default;
|
|
|
37
37
|
// The variables above should give enough control.
|
|
38
38
|
|
|
39
39
|
/* Clearing Styles */
|
|
40
|
-
|
|
40
|
+
.clearing-thumbs, #{data('clearing')} {
|
|
41
41
|
@include clearfix;
|
|
42
42
|
margin-bottom: 0;
|
|
43
43
|
margin-#{$default-float}: 0;
|
|
@@ -47,6 +47,10 @@ $clearing-carousel-thumb-active-border: 1px solid rgb(255,255,255) !default;
|
|
|
47
47
|
float: $default-float;
|
|
48
48
|
margin-#{$opposite-direction}: 10px;
|
|
49
49
|
}
|
|
50
|
+
|
|
51
|
+
&[class*="block-grid-"] li {
|
|
52
|
+
margin-#{$opposite-direction}: 0;
|
|
53
|
+
}
|
|
50
54
|
}
|
|
51
55
|
|
|
52
56
|
.clearing-blackout {
|
|
@@ -69,6 +73,14 @@ $clearing-carousel-thumb-active-border: 1px solid rgb(255,255,255) !default;
|
|
|
69
73
|
margin: 0;
|
|
70
74
|
}
|
|
71
75
|
|
|
76
|
+
.clearing-touch-label {
|
|
77
|
+
position: absolute;
|
|
78
|
+
top: 50%;
|
|
79
|
+
left: 50%;
|
|
80
|
+
color: #aaa;
|
|
81
|
+
font-size: 0.6em;
|
|
82
|
+
}
|
|
83
|
+
|
|
72
84
|
.visible-img {
|
|
73
85
|
height: 95%;
|
|
74
86
|
position: relative;
|
|
@@ -115,7 +115,7 @@ $dropdown-button-pip-top-lrg: -$button-pip-lrg / 2 + rem-calc(3) !default;
|
|
|
115
115
|
|
|
116
116
|
@include exports("dropdown-button") {
|
|
117
117
|
@if $include-html-button-classes {
|
|
118
|
-
.dropdown.button { @include dropdown-button;
|
|
118
|
+
.dropdown.button, button.dropdown { @include dropdown-button;
|
|
119
119
|
&.tiny { @include dropdown-button(tiny,$base-style:false); }
|
|
120
120
|
&.small { @include dropdown-button(small,$base-style:false); }
|
|
121
121
|
&.large { @include dropdown-button(large,$base-style:false); }
|
|
@@ -11,7 +11,7 @@ $flex-video-padding-bottom: 67.5% !default;
|
|
|
11
11
|
$flex-video-margin-bottom: rem-calc(16) !default;
|
|
12
12
|
|
|
13
13
|
// We use this to control widescreen bottom padding
|
|
14
|
-
$flex-video-widescreen-padding-bottom:
|
|
14
|
+
$flex-video-widescreen-padding-bottom: 56.55% !default;
|
|
15
15
|
|
|
16
16
|
//
|
|
17
17
|
// @mixins
|
|
@@ -13,8 +13,9 @@ $form-spacing: rem-calc(16) !default;
|
|
|
13
13
|
$form-label-pointer: pointer !default;
|
|
14
14
|
$form-label-font-size: rem-calc(14) !default;
|
|
15
15
|
$form-label-font-weight: normal !default;
|
|
16
|
+
$form-label-line-height: 1.5 !default;
|
|
16
17
|
$form-label-font-color: scale-color(#000, $lightness: 30%) !default;
|
|
17
|
-
$form-label-bottom-margin:
|
|
18
|
+
$form-label-bottom-margin: 0 !default;
|
|
18
19
|
$input-font-family: inherit !default;
|
|
19
20
|
$input-font-color: rgba(0,0,0,0.75) !default;
|
|
20
21
|
$input-font-size: rem-calc(14) !default;
|
|
@@ -146,6 +147,7 @@ $select-bg-color: #fafafa !default;
|
|
|
146
147
|
cursor: $form-label-pointer;
|
|
147
148
|
display: block;
|
|
148
149
|
font-weight: $form-label-font-weight;
|
|
150
|
+
line-height: $form-label-line-height;
|
|
149
151
|
margin-bottom: $form-label-bottom-margin;
|
|
150
152
|
}
|
|
151
153
|
|
|
@@ -183,12 +185,11 @@ $select-bg-color: #fafafa !default;
|
|
|
183
185
|
// $bg - Default:$input-prefix-bg || scale-color(#fff, $lightness: -5%) !default;
|
|
184
186
|
// $is-button - Toggle position settings if prefix is a button. Default:false
|
|
185
187
|
//
|
|
186
|
-
@mixin prefix($bg:$input-prefix-bg
|
|
188
|
+
@mixin prefix($bg:$input-prefix-bg, $border:$input-prefix-border-color, $is-button:false) {
|
|
187
189
|
|
|
188
190
|
@if $bg {
|
|
189
191
|
$bg-lightness: lightness($bg);
|
|
190
192
|
background: $bg;
|
|
191
|
-
border-color: scale-color($bg, $lightness: -11%);
|
|
192
193
|
border-#{$opposite-direction}: none;
|
|
193
194
|
|
|
194
195
|
// Control the font color based on background brightness
|
|
@@ -196,6 +197,10 @@ $select-bg-color: #fafafa !default;
|
|
|
196
197
|
@else { color: $input-prefix-font-color-alt; }
|
|
197
198
|
}
|
|
198
199
|
|
|
200
|
+
@if $border {
|
|
201
|
+
border-color: $border;
|
|
202
|
+
}
|
|
203
|
+
|
|
199
204
|
@if $is-button {
|
|
200
205
|
padding-#{$default-float}: 0;
|
|
201
206
|
padding-#{$opposite-direction}: 0;
|
|
@@ -213,12 +218,11 @@ $select-bg-color: #fafafa !default;
|
|
|
213
218
|
// We use this mixin to create postfix label styles
|
|
214
219
|
// $bg - Default:$input-prefix-bg || scale-color(#fff, $lightness: -5%) !default;
|
|
215
220
|
// $is-button - Toggle position settings if prefix is a button. Default: false
|
|
216
|
-
@mixin postfix($bg:$input-prefix-bg, $is-button:false) {
|
|
221
|
+
@mixin postfix($bg:$input-prefix-bg, $border:$input-prefix-border-color, $is-button:false) {
|
|
217
222
|
|
|
218
223
|
@if $bg {
|
|
219
224
|
$bg-lightness: lightness($bg);
|
|
220
225
|
background: $bg;
|
|
221
|
-
border-color: scale-color($bg, $lightness: -16%);
|
|
222
226
|
border-#{$default-float}: none;
|
|
223
227
|
|
|
224
228
|
// Control the font color based on background brightness
|
|
@@ -226,6 +230,10 @@ $select-bg-color: #fafafa !default;
|
|
|
226
230
|
@else { color: $input-prefix-font-color-alt; }
|
|
227
231
|
}
|
|
228
232
|
|
|
233
|
+
@if $border {
|
|
234
|
+
border-color: $border;
|
|
235
|
+
}
|
|
236
|
+
|
|
229
237
|
@if $is-button {
|
|
230
238
|
padding-#{$default-float}: 0;
|
|
231
239
|
padding-#{$opposite-direction}: 0;
|
|
@@ -349,8 +357,8 @@ $select-bg-color: #fafafa !default;
|
|
|
349
357
|
.postfix { @include prefix-postfix-base; }
|
|
350
358
|
|
|
351
359
|
/* Adjust padding, alignment and radius if pre/post element is a button */
|
|
352
|
-
.postfix.button { @include button-size(false,false,false); @include postfix(false,true); }
|
|
353
|
-
.prefix.button { @include button-size(false,false,false); @include prefix(false,true); }
|
|
360
|
+
.postfix.button { @include button-size(false,false,false); @include postfix(false, false, true); }
|
|
361
|
+
.prefix.button { @include button-size(false,false,false); @include prefix(false, false, true); }
|
|
354
362
|
|
|
355
363
|
.prefix.button.radius { @include radius(0); @include side-radius(left, $button-radius); }
|
|
356
364
|
.postfix.button.radius { @include radius(0); @include side-radius(right, $button-radius); }
|
|
@@ -365,26 +373,6 @@ $select-bg-color: #fafafa !default;
|
|
|
365
373
|
&.radius { @include radius(0); @include side-radius(right, $global-radius); }
|
|
366
374
|
}
|
|
367
375
|
|
|
368
|
-
/* Input groups will automatically style first and last elements of the group */
|
|
369
|
-
.input-group {
|
|
370
|
-
&.radius {
|
|
371
|
-
&>*:first-child, &>*:first-child * {
|
|
372
|
-
@include side-radius($default-float, $global-radius);
|
|
373
|
-
}
|
|
374
|
-
&>*:last-child, &>*:last-child * {
|
|
375
|
-
@include side-radius($opposite-direction, $global-radius);
|
|
376
|
-
}
|
|
377
|
-
}
|
|
378
|
-
&.round {
|
|
379
|
-
&>*:first-child, &>*:first-child * {
|
|
380
|
-
@include side-radius($default-float, $button-round);
|
|
381
|
-
}
|
|
382
|
-
&>*:last-child, &>*:last-child * {
|
|
383
|
-
@include side-radius($opposite-direction, $button-round);
|
|
384
|
-
}
|
|
385
|
-
}
|
|
386
|
-
}
|
|
387
|
-
|
|
388
376
|
/* We use this to get basic styling on all basic form elements */
|
|
389
377
|
input[type="text"],
|
|
390
378
|
input[type="password"],
|
|
@@ -443,15 +431,17 @@ $select-bg-color: #fafafa !default;
|
|
|
443
431
|
|
|
444
432
|
/* Error Handling */
|
|
445
433
|
|
|
446
|
-
|
|
434
|
+
#{data('abide')} {
|
|
447
435
|
.error small.error, span.error, small.error {
|
|
448
436
|
@include form-error-message;
|
|
449
437
|
}
|
|
450
438
|
span.error, small.error { display: none; }
|
|
451
439
|
}
|
|
440
|
+
|
|
452
441
|
span.error, small.error {
|
|
453
442
|
@include form-error-message;
|
|
454
443
|
}
|
|
444
|
+
|
|
455
445
|
.error {
|
|
456
446
|
input,
|
|
457
447
|
textarea,
|
|
@@ -459,12 +449,16 @@ $select-bg-color: #fafafa !default;
|
|
|
459
449
|
margin-bottom: 0;
|
|
460
450
|
}
|
|
461
451
|
|
|
452
|
+
input[type="checkbox"],
|
|
453
|
+
input[type="radio"] {
|
|
454
|
+
margin-bottom: $form-spacing
|
|
455
|
+
}
|
|
456
|
+
|
|
462
457
|
label,
|
|
463
458
|
label.error {
|
|
464
459
|
@include form-label-error-color;
|
|
465
460
|
}
|
|
466
461
|
|
|
467
|
-
> small,
|
|
468
462
|
small.error {
|
|
469
463
|
@include form-error-message;
|
|
470
464
|
}
|
|
@@ -3,11 +3,18 @@
|
|
|
3
3
|
// Foundation Variables
|
|
4
4
|
//
|
|
5
5
|
|
|
6
|
+
// Data attribute namespace
|
|
7
|
+
// styles get applied to [data-mysite-plugin], etc
|
|
8
|
+
$namespace: false !default;
|
|
9
|
+
|
|
10
|
+
meta.foundation-data-attribute-namespace {
|
|
11
|
+
font-family: #{$namespace};
|
|
12
|
+
}
|
|
6
13
|
|
|
7
14
|
$experimental: true !default;
|
|
8
15
|
|
|
9
16
|
// The default font-size is set to 100% of the browser style sheet (usually 16px)
|
|
10
|
-
// for compatibility with
|
|
17
|
+
// for compatibility with browser-based text zoom or user-set defaults.
|
|
11
18
|
|
|
12
19
|
// Since the typical default browser font-size is 16px, that makes the calculation for grid size.
|
|
13
20
|
// If you want your base font-size to be different and not have it affect the grid breakpoints,
|
|
@@ -17,6 +24,9 @@ $base-font-size: 100% !default;
|
|
|
17
24
|
// $base-line-height is 24px while $base-font-size is 16px
|
|
18
25
|
$base-line-height: 150% !default;
|
|
19
26
|
|
|
27
|
+
// Must be 100% for off cavas to work
|
|
28
|
+
html, body { height: 100%; }
|
|
29
|
+
|
|
20
30
|
//
|
|
21
31
|
// Global Foundation Mixins
|
|
22
32
|
//
|
|
@@ -39,46 +49,14 @@ $base-line-height: 150% !default;
|
|
|
39
49
|
// We use this to create equal side border radius on elements.
|
|
40
50
|
// $side - Options: left, right, top, bottom
|
|
41
51
|
@mixin side-radius($side, $radius:$global-radius) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
border-top-left-radius: $radius;
|
|
51
|
-
}
|
|
52
|
-
@else if $side == right {
|
|
53
|
-
@if $experimental {
|
|
54
|
-
-moz-border-radius-topright: $radius;
|
|
55
|
-
-moz-border-radius-bottomright: $radius;
|
|
56
|
-
-webkit-border-top-right-radius: $radius;
|
|
57
|
-
-webkit-border-bottom-right-radius: $radius;
|
|
58
|
-
}
|
|
59
|
-
border-top-right-radius: $radius;
|
|
60
|
-
border-bottom-right-radius: $radius;
|
|
61
|
-
}
|
|
62
|
-
@else if $side == top {
|
|
63
|
-
@if $experimental {
|
|
64
|
-
-moz-border-radius-topright: $radius;
|
|
65
|
-
-moz-border-radius-topleft: $radius;
|
|
66
|
-
-webkit-border-top-right-radius: $radius;
|
|
67
|
-
-webkit-border-top-left-radius: $radius;
|
|
68
|
-
}
|
|
69
|
-
border-top-right-radius: $radius;
|
|
70
|
-
border-top-left-radius: $radius;
|
|
71
|
-
}
|
|
72
|
-
@else if $side == bottom {
|
|
73
|
-
@if $experimental {
|
|
74
|
-
-moz-border-radius-bottomright: $radius;
|
|
75
|
-
-moz-border-radius-bottomleft: $radius;
|
|
76
|
-
-webkit-border-bottom-right-radius: $radius;
|
|
77
|
-
-webkit-border-bottom-left-radius: $radius;
|
|
78
|
-
}
|
|
79
|
-
border-bottom-right-radius: $radius;
|
|
80
|
-
border-bottom-left-radius: $radius;
|
|
81
|
-
}
|
|
52
|
+
@if $experimental {
|
|
53
|
+
-moz-border-radius-bottom#{$side}: $radius;
|
|
54
|
+
-moz-border-radius-top#{$side}: $radius;
|
|
55
|
+
-webkit-border-bottom-#{$side}-radius: $radius;
|
|
56
|
+
-webkit-border-top-#{$side}-radius: $radius;
|
|
57
|
+
}
|
|
58
|
+
border-bottom-#{$side}-radius: $radius;
|
|
59
|
+
border-top-#{$side}-radius: $radius;
|
|
82
60
|
}
|
|
83
61
|
|
|
84
62
|
// @mixins
|
|
@@ -210,8 +188,6 @@ $font-smoothing: antialiased !default;
|
|
|
210
188
|
|
|
211
189
|
// We use these to control text direction settings
|
|
212
190
|
$text-direction: ltr !default;
|
|
213
|
-
|
|
214
|
-
// NOTE: No need to change this conditional statement, $text-direction variable controls it all.
|
|
215
191
|
$default-float: left !default;
|
|
216
192
|
$opposite-direction: right !default;
|
|
217
193
|
@if $text-direction == ltr {
|
|
@@ -221,7 +197,6 @@ $opposite-direction: right !default;
|
|
|
221
197
|
$default-float: right;
|
|
222
198
|
$opposite-direction: left;
|
|
223
199
|
}
|
|
224
|
-
|
|
225
200
|
// We use these as default colors throughout
|
|
226
201
|
$primary-color: #008CBA !default;
|
|
227
202
|
$secondary-color: #e7e7e7 !default;
|
|
@@ -250,7 +225,7 @@ $small-range: (0em, 40em) !default;
|
|
|
250
225
|
$medium-range: (40.063em, 64em) !default;
|
|
251
226
|
$large-range: (64.063em, 90em) !default;
|
|
252
227
|
$xlarge-range: (90.063em, 120em) !default;
|
|
253
|
-
$xxlarge-range: (120.063em) !default;
|
|
228
|
+
$xxlarge-range: (120.063em, 99999999em) !default;
|
|
254
229
|
|
|
255
230
|
|
|
256
231
|
$screen: "only screen" !default;
|
|
@@ -288,6 +263,9 @@ $cursor-text-value: text !default;
|
|
|
288
263
|
|
|
289
264
|
|
|
290
265
|
@include exports("global") {
|
|
266
|
+
meta.foundation-version {
|
|
267
|
+
font-family: "/5.1.0/";
|
|
268
|
+
}
|
|
291
269
|
// Used to provide media query values for javascript components.
|
|
292
270
|
// Forward slash placed around everything to convince PhantomJS to read the value.
|
|
293
271
|
meta.foundation-mq-small {
|
|
@@ -364,16 +342,7 @@ $cursor-text-value: text !default;
|
|
|
364
342
|
.left { float: left !important; }
|
|
365
343
|
.right { float: right !important; }
|
|
366
344
|
.clearfix { @include clearfix; }
|
|
367
|
-
.text-left { text-align: left !important; }
|
|
368
|
-
.text-right { text-align: right !important; }
|
|
369
|
-
.text-center { text-align: center !important; }
|
|
370
|
-
.text-justify { text-align: justify !important; }
|
|
371
345
|
.hide { display: none; }
|
|
372
|
-
// Bidi counterparts to .left, .right, .text-left, .text-right
|
|
373
|
-
.start { float: $default-float !important; }
|
|
374
|
-
.end { float: $opposite-direction !important; }
|
|
375
|
-
.text-start { text-align: $default-float !important; }
|
|
376
|
-
.text-end { text-align: $opposite-direction !important; }
|
|
377
346
|
|
|
378
347
|
// Font smoothing
|
|
379
348
|
// Antialiased font smoothing works best for light text on a dark background.
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
// @variables
|
|
5
5
|
//
|
|
6
6
|
$include-html-grid-classes: $include-html-classes !default;
|
|
7
|
+
$include-xl-html-grid-classes: false !default;
|
|
7
8
|
|
|
8
9
|
$row-width: rem-calc(1000) !default;
|
|
9
10
|
$column-gutter: rem-calc(30) !default;
|
|
@@ -33,7 +34,7 @@ $total-columns: 12 !default;
|
|
|
33
34
|
// For creating container, nested, and collapsed rows.
|
|
34
35
|
//
|
|
35
36
|
//
|
|
36
|
-
// $behavior - Any special
|
|
37
|
+
// $behavior - Any special behavior for this row? Default: false. Options: nest, collapse, nest-collapse, false.
|
|
37
38
|
@mixin grid-row($behavior: false) {
|
|
38
39
|
|
|
39
40
|
// use @include grid-row(nest); to include a nested row
|
|
@@ -92,9 +93,13 @@ $total-columns: 12 !default;
|
|
|
92
93
|
$push:false,
|
|
93
94
|
$pull:false,
|
|
94
95
|
$collapse:false,
|
|
95
|
-
$float:true
|
|
96
|
+
$float:true,
|
|
97
|
+
$position:false) {
|
|
96
98
|
|
|
97
|
-
|
|
99
|
+
// If positioned for default .column, include relative position
|
|
100
|
+
@if $position {
|
|
101
|
+
position: relative;
|
|
102
|
+
}
|
|
98
103
|
|
|
99
104
|
// If collapsed, get rid of gutter padding
|
|
100
105
|
@if $collapse {
|
|
@@ -121,6 +126,12 @@ $total-columns: 12 !default;
|
|
|
121
126
|
@if $push { #{$default-float}: grid-calc($push, $total-columns); #{$opposite-direction}: auto; }
|
|
122
127
|
@if $pull { #{$opposite-direction}: grid-calc($pull, $total-columns); #{$default-float}: auto; }
|
|
123
128
|
|
|
129
|
+
@if $float {
|
|
130
|
+
@if $float == left or $float == true { float: $default-float; }
|
|
131
|
+
@else if $float == right { float: $opposite-direction; }
|
|
132
|
+
@else { float: none; }
|
|
133
|
+
}
|
|
134
|
+
|
|
124
135
|
// If centered, get rid of float and add appropriate margins
|
|
125
136
|
@if $center {
|
|
126
137
|
margin-#{$default-float}: auto;
|
|
@@ -131,12 +142,6 @@ $total-columns: 12 !default;
|
|
|
131
142
|
// If offset, calculate appropriate margins
|
|
132
143
|
@if $offset { margin-#{$default-float}: grid-calc($offset, $total-columns) !important; }
|
|
133
144
|
|
|
134
|
-
@if $float {
|
|
135
|
-
@if $float == left or $float == true { float: $default-float; }
|
|
136
|
-
@else if $float == right { float: $opposite-direction; }
|
|
137
|
-
@else { float: none; }
|
|
138
|
-
}
|
|
139
|
-
|
|
140
145
|
}
|
|
141
146
|
|
|
142
147
|
// Create presentational classes for grid
|
|
@@ -159,32 +164,32 @@ $total-columns: 12 !default;
|
|
|
159
164
|
float: $opposite-direction;
|
|
160
165
|
}
|
|
161
166
|
|
|
162
|
-
@for $i from
|
|
163
|
-
.#{$size}-push
|
|
167
|
+
@for $i from 0 through $total-columns - 1 {
|
|
168
|
+
.#{$size}-push-#{$i} {
|
|
164
169
|
@include grid-column($push:$i, $collapse:null, $float:false);
|
|
165
170
|
}
|
|
166
|
-
.#{$size}-pull
|
|
171
|
+
.#{$size}-pull-#{$i} {
|
|
167
172
|
@include grid-column($pull:$i, $collapse:null, $float:false);
|
|
168
173
|
}
|
|
169
174
|
}
|
|
170
175
|
|
|
171
176
|
.column,
|
|
172
|
-
.columns { @include grid-column($columns:false); }
|
|
177
|
+
.columns { @include grid-column($columns:false, $position:true); }
|
|
173
178
|
|
|
174
179
|
|
|
175
180
|
@for $i from 1 through $total-columns {
|
|
176
|
-
.#{$size}
|
|
181
|
+
.#{$size}-#{$i} { @include grid-column($columns:$i,$collapse:null,$float:false); }
|
|
177
182
|
}
|
|
178
183
|
|
|
179
184
|
[class*="column"] + [class*="column"]:last-child { float: $opposite-direction; }
|
|
180
185
|
[class*="column"] + [class*="column"].end { float: $default-float; }
|
|
181
186
|
|
|
182
187
|
|
|
183
|
-
@for $i from 0 through $total-columns -
|
|
188
|
+
@for $i from 0 through $total-columns - 1 {
|
|
184
189
|
.#{$size}-offset-#{$i} { @include grid-column($offset:$i, $collapse:null,$float:false); }
|
|
185
190
|
}
|
|
186
|
-
|
|
187
|
-
|
|
191
|
+
.#{$size}-reset-order,
|
|
192
|
+
.#{$size}-reset-order {
|
|
188
193
|
margin-#{$default-float}: 0;
|
|
189
194
|
margin-#{$opposite-direction}: 0;
|
|
190
195
|
left: auto;
|
|
@@ -220,31 +225,33 @@ $total-columns: 12 !default;
|
|
|
220
225
|
@media #{$medium-up} {
|
|
221
226
|
@include grid-html-classes($size:medium);
|
|
222
227
|
// Old push and pull classes
|
|
223
|
-
@for $i from
|
|
224
|
-
.push
|
|
228
|
+
@for $i from 0 through $total-columns - 1 {
|
|
229
|
+
.push-#{$i} {
|
|
225
230
|
@include grid-column($push:$i, $collapse:null, $float:false);
|
|
226
231
|
}
|
|
227
|
-
.pull
|
|
232
|
+
.pull-#{$i} {
|
|
228
233
|
@include grid-column($pull:$i, $collapse:null, $float:false);
|
|
229
234
|
}
|
|
230
235
|
}
|
|
231
236
|
}
|
|
232
237
|
@media #{$large-up} {
|
|
233
238
|
@include grid-html-classes($size:large);
|
|
234
|
-
@for $i from
|
|
235
|
-
.push
|
|
239
|
+
@for $i from 0 through $total-columns - 1 {
|
|
240
|
+
.push-#{$i} {
|
|
236
241
|
@include grid-column($push:$i, $collapse:null, $float:false);
|
|
237
242
|
}
|
|
238
|
-
.pull
|
|
243
|
+
.pull-#{$i} {
|
|
239
244
|
@include grid-column($pull:$i, $collapse:null, $float:false);
|
|
240
245
|
}
|
|
241
246
|
}
|
|
242
247
|
}
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
}
|
|
248
|
+
}
|
|
249
|
+
@if $include-xl-html-grid-classes {
|
|
250
|
+
@media #{$xlarge-up} {
|
|
251
|
+
@include grid-html-classes($size:xlarge);
|
|
252
|
+
}
|
|
253
|
+
@media #{$xxlarge-up} {
|
|
254
|
+
@include grid-html-classes($size:xxlarge);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|