zurb-foundation 4.0.9 → 4.1.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.
- data/Gemfile.lock +1 -1
- data/README.md +10 -3
- data/docs/Gemfile +4 -1
- data/docs/Gemfile.lock +1 -1
- data/docs/_sidebar-components.html.erb +1 -0
- data/docs/_sidebar.html.erb +2 -0
- data/docs/components/dropdown.html.erb +3 -3
- data/docs/components/global.html.erb +1 -1
- data/docs/components/grid.html.erb +4 -4
- data/docs/components/joyride.html.erb +4 -1
- data/docs/components/kitchen-sink.html.erb +864 -0
- data/docs/components/orbit.html.erb +1 -1
- data/docs/components/section.html.erb +29 -2
- data/docs/components/split-buttons.html.erb +1 -1
- data/docs/components/top-bar.html.erb +0 -3
- data/docs/css/docs.scss +8 -6
- data/docs/layout.html.erb +13 -2
- data/docs/rtl.html.erb +53 -0
- data/docs/support.html.erb +1 -1
- data/js/foundation/foundation.clearing.js +20 -14
- data/js/foundation/foundation.dropdown.js +10 -11
- data/js/foundation/foundation.forms.js +45 -13
- data/js/foundation/foundation.joyride.js +14 -6
- data/js/foundation/foundation.js +7 -1
- data/js/foundation/foundation.orbit.js +10 -8
- data/js/foundation/foundation.reveal.js +1 -1
- data/js/foundation/foundation.section.js +23 -7
- data/js/foundation/foundation.tooltips.js +7 -3
- data/js/foundation/foundation.topbar.js +28 -12
- data/lib/foundation/generators/install_generator.rb +1 -1
- data/lib/foundation/version.rb +1 -1
- data/package.json +7 -1
- data/scss/foundation/_foundation-global.scss +3 -3
- data/scss/foundation/components/_alert-boxes.scss +4 -4
- data/scss/foundation/components/_button-groups.scss +6 -4
- data/scss/foundation/components/_buttons.scss +4 -4
- data/scss/foundation/components/_clearing.scss +18 -16
- data/scss/foundation/components/_custom-forms.scss +8 -8
- data/scss/foundation/components/_dropdown-buttons.scss +12 -12
- data/scss/foundation/components/_dropdown.scss +5 -6
- data/scss/foundation/components/_forms.scss +15 -15
- data/scss/foundation/components/_grid.scss +18 -18
- data/scss/foundation/components/_inline-lists.scss +8 -3
- data/scss/foundation/components/_joyride.scss +8 -8
- data/scss/foundation/components/_magellan.scss +3 -2
- data/scss/foundation/components/_orbit.scss +24 -16
- data/scss/foundation/components/_pricing-tables.scss +1 -1
- data/scss/foundation/components/_reveal.scss +2 -2
- data/scss/foundation/components/_section.scss +5 -5
- data/scss/foundation/components/_split-buttons.scss +18 -18
- data/scss/foundation/components/_sub-nav.scss +1 -1
- data/scss/foundation/components/_switch.scss +11 -12
- data/scss/foundation/components/_tables.scss +1 -1
- data/scss/foundation/components/_tooltips.scss +2 -1
- data/scss/foundation/components/_top-bar.scss +10 -9
- data/templates/project/index.html +2 -2
- data/templates/project/scss/_settings.scss +8 -0
- metadata +6 -4
@@ -86,7 +86,7 @@ $clearing-carousel-thumb-active-border: 4px solid rgb(255,255,255) !default;
|
|
86
86
|
|
87
87
|
.clearing-close {
|
88
88
|
z-index: 999;
|
89
|
-
padding-
|
89
|
+
padding-#{$default-float}: 20px;
|
90
90
|
padding-top: 10px;
|
91
91
|
font-size: $clearing-close-size;
|
92
92
|
line-height: 1;
|
@@ -104,8 +104,8 @@ $clearing-carousel-thumb-active-border: 4px solid rgb(255,255,255) !default;
|
|
104
104
|
|
105
105
|
// Large screen overrides
|
106
106
|
@media #{$small} {
|
107
|
-
.clearing-main-
|
108
|
-
.clearing-main-
|
107
|
+
.clearing-main-prev,
|
108
|
+
.clearing-main-next {
|
109
109
|
position: absolute;
|
110
110
|
height: 100%;
|
111
111
|
width: 40px;
|
@@ -119,22 +119,24 @@ $clearing-carousel-thumb-active-border: 4px solid rgb(255,255,255) !default;
|
|
119
119
|
border: solid $clearing-arrow-size;
|
120
120
|
}
|
121
121
|
}
|
122
|
-
.clearing-main-
|
123
|
-
|
122
|
+
.clearing-main-prev {
|
123
|
+
#{$default-float}: 0;
|
124
124
|
& > span {
|
125
|
-
|
126
|
-
border-color: transparent
|
125
|
+
#{$default-float}: 5px;
|
126
|
+
border-color: transparent;
|
127
|
+
border-#{$opposite-direction}-color: $clearing-arrow-color;
|
127
128
|
}
|
128
129
|
}
|
129
|
-
.clearing-main-
|
130
|
-
|
130
|
+
.clearing-main-next {
|
131
|
+
#{$opposite-direction}: 0;
|
131
132
|
& > span {
|
132
|
-
border-color: transparent
|
133
|
+
border-color: transparent;
|
134
|
+
border-#{$default-float}-color: $clearing-arrow-color;
|
133
135
|
}
|
134
136
|
}
|
135
137
|
|
136
|
-
.clearing-main-
|
137
|
-
.clearing-main-
|
138
|
+
.clearing-main-prev.disabled,
|
139
|
+
.clearing-main-next.disabled { opacity: 0.5; }
|
138
140
|
|
139
141
|
// If you want to show a lightbox, but only have a single image come through as the thumbnail
|
140
142
|
.clearing-feature ~ li { display: none; }
|
@@ -151,7 +153,7 @@ $clearing-carousel-thumb-active-border: 4px solid rgb(255,255,255) !default;
|
|
151
153
|
z-index: 999;
|
152
154
|
width: 200%;
|
153
155
|
height: 100%;
|
154
|
-
margin-
|
156
|
+
margin-#{$default-float}: 0;
|
155
157
|
position: relative;
|
156
158
|
#{$default-float}: 0;
|
157
159
|
|
@@ -162,7 +164,7 @@ $clearing-carousel-thumb-active-border: 4px solid rgb(255,255,255) !default;
|
|
162
164
|
padding: 0;
|
163
165
|
float: $default-float;
|
164
166
|
overflow: hidden;
|
165
|
-
margin-#{$
|
167
|
+
margin-#{$opposite-direction}: 1px;
|
166
168
|
position: relative;
|
167
169
|
cursor: pointer;
|
168
170
|
opacity: 0.4;
|
@@ -202,8 +204,8 @@ $clearing-carousel-thumb-active-border: 4px solid rgb(255,255,255) !default;
|
|
202
204
|
.clearing-close {
|
203
205
|
position: absolute;
|
204
206
|
top: 10px;
|
205
|
-
#{$
|
206
|
-
padding-
|
207
|
+
#{$opposite-direction}: 20px;
|
208
|
+
padding-#{$default-float}: 0;
|
207
209
|
padding-top: 0;
|
208
210
|
}
|
209
211
|
}
|
@@ -32,8 +32,8 @@ $custom-dropdown-font-color-selected: #000 !default;
|
|
32
32
|
$custom-dropdown-shadow: 0 2px 2px 0px rgba(0,0,0,0.1) !default;
|
33
33
|
$custom-dropdown-offset-top: auto !default;
|
34
34
|
$custom-dropdown-list-padding: emCalc(4px) !default;
|
35
|
-
$custom-dropdown-
|
36
|
-
$custom-dropdown-
|
35
|
+
$custom-dropdown-default-float-padding: emCalc(6px) !default;
|
36
|
+
$custom-dropdown-opposite-padding: emCalc(38px) !default;
|
37
37
|
$custom-dropdown-list-item-min-height: emCalc(24px) !default;
|
38
38
|
$custom-dropdown-width-small: 134px !default;
|
39
39
|
$custom-dropdown-width-medium: 254px !default;
|
@@ -132,8 +132,8 @@ $custom-dropdown-width-large: 434px !default;
|
|
132
132
|
text-decoration: none;
|
133
133
|
overflow: hidden;
|
134
134
|
display: block;
|
135
|
-
margin-
|
136
|
-
margin-
|
135
|
+
margin-#{$default-float}: $form-spacing / 2;
|
136
|
+
margin-#{$opposite-direction}: $custom-select-height;
|
137
137
|
}
|
138
138
|
|
139
139
|
.selector {
|
@@ -142,14 +142,14 @@ $custom-dropdown-width-large: 434px !default;
|
|
142
142
|
width: $form-spacing * 2.5;
|
143
143
|
height: $custom-select-height;
|
144
144
|
display: block;
|
145
|
-
#{$
|
145
|
+
#{$opposite-direction}: 0;
|
146
146
|
top: 0;
|
147
147
|
&:after {
|
148
148
|
content: "";
|
149
149
|
display: block;
|
150
150
|
@include css-triangle(5px, $custom-select-triangle-color, top);
|
151
151
|
position: absolute;
|
152
|
-
|
152
|
+
#{$default-float}: ($form-spacing * 2.5) / 2 - emCalc(5px);
|
153
153
|
top: 50%;
|
154
154
|
margin-top: -3px;
|
155
155
|
}
|
@@ -208,8 +208,8 @@ $custom-dropdown-width-large: 434px !default;
|
|
208
208
|
cursor: default;
|
209
209
|
padding-top: $custom-dropdown-list-padding;
|
210
210
|
padding-bottom: $custom-dropdown-list-padding;
|
211
|
-
padding-#{$default-float}: $custom-dropdown-
|
212
|
-
padding-#{$
|
211
|
+
padding-#{$default-float}: $custom-dropdown-default-float-padding;
|
212
|
+
padding-#{$opposite-direction}: $custom-dropdown-opposite-padding;
|
213
213
|
min-height: $custom-dropdown-list-item-min-height;
|
214
214
|
line-height: $custom-dropdown-list-item-min-height;
|
215
215
|
margin: 0;
|
@@ -9,25 +9,25 @@ $dropdown-button-pip-color-alt: #333 !default;
|
|
9
9
|
// We use these to style tiny dropdown buttons
|
10
10
|
$dropdown-button-padding-tny: $button-tny * 5 !default;
|
11
11
|
$dropdown-button-pip-size-tny: $button-tny !default;
|
12
|
-
$dropdown-button-pip-
|
12
|
+
$dropdown-button-pip-opposite-tny: $button-tny * 2 !default;
|
13
13
|
$dropdown-button-pip-top-tny: -$button-tny / 2 + emCalc(1px) !default;
|
14
14
|
|
15
15
|
// We use these to style small dropdown buttons
|
16
16
|
$dropdown-button-padding-sml: $button-sml * 5 !default;
|
17
17
|
$dropdown-button-pip-size-sml: $button-sml !default;
|
18
|
-
$dropdown-button-pip-
|
18
|
+
$dropdown-button-pip-opposite-sml: $button-sml * 2 !default;
|
19
19
|
$dropdown-button-pip-top-sml: -$button-sml / 2 + emCalc(1px) !default;
|
20
20
|
|
21
21
|
// We use these to style medium dropdown buttons
|
22
22
|
$dropdown-button-padding-med: $button-med * 4 + emCalc(3px) !default;
|
23
23
|
$dropdown-button-pip-size-med: $button-med - emCalc(3px) !default;
|
24
|
-
$dropdown-button-pip-
|
24
|
+
$dropdown-button-pip-opposite-med: $button-med * 2 !default;
|
25
25
|
$dropdown-button-pip-top-med: -$button-med / 2 + emCalc(2px) !default;
|
26
26
|
|
27
27
|
// We use these to style large dropdown buttons
|
28
28
|
$dropdown-button-padding-lrg: $button-lrg * 4 !default;
|
29
29
|
$dropdown-button-pip-size-lrg: $button-lrg - emCalc(6px) !default;
|
30
|
-
$dropdown-button-pip-
|
30
|
+
$dropdown-button-pip-opposite-lrg: $button-lrg + emCalc(12px) !default;
|
31
31
|
$dropdown-button-pip-top-lrg: -$button-lrg / 2 + emCalc(3px) !default;
|
32
32
|
|
33
33
|
//
|
@@ -56,40 +56,40 @@ $dropdown-button-pip-top-lrg: -$button-lrg / 2 + emCalc(3px) !default;
|
|
56
56
|
|
57
57
|
// If we're dealing with tiny buttons, use these styles
|
58
58
|
@if $padding == tiny {
|
59
|
-
padding-#{$
|
59
|
+
padding-#{$opposite-direction}: $dropdown-button-padding-tny;
|
60
60
|
&:before {
|
61
61
|
border-width: $dropdown-button-pip-size-tny;
|
62
|
-
|
62
|
+
#{$opposite-direction}: $dropdown-button-pip-opposite-tny;
|
63
63
|
margin-top: $dropdown-button-pip-top-tny;
|
64
64
|
}
|
65
65
|
}
|
66
66
|
|
67
67
|
// If we're dealing with small buttons, use these styles
|
68
68
|
@if $padding == small {
|
69
|
-
padding-#{$
|
69
|
+
padding-#{$opposite-direction}: $dropdown-button-padding-sml;
|
70
70
|
&:before {
|
71
71
|
border-width: $dropdown-button-pip-size-sml;
|
72
|
-
|
72
|
+
#{$opposite-direction}: $dropdown-button-pip-opposite-sml;
|
73
73
|
margin-top: $dropdown-button-pip-top-sml;
|
74
74
|
}
|
75
75
|
}
|
76
76
|
|
77
77
|
// If we're dealing with default (medium) buttons, use these styles
|
78
78
|
@if $padding == medium {
|
79
|
-
padding-#{$
|
79
|
+
padding-#{$opposite-direction}: $dropdown-button-padding-med;
|
80
80
|
&:before {
|
81
81
|
border-width: $dropdown-button-pip-size-med;
|
82
|
-
|
82
|
+
#{$opposite-direction}: $dropdown-button-pip-opposite-med;
|
83
83
|
margin-top: $dropdown-button-pip-top-med;
|
84
84
|
}
|
85
85
|
}
|
86
86
|
|
87
87
|
// If we're dealing with large buttons, use these styles
|
88
88
|
@if $padding == large {
|
89
|
-
padding-#{$
|
89
|
+
padding-#{$opposite-direction}: $dropdown-button-padding-lrg;
|
90
90
|
&:before {
|
91
91
|
border-width: $dropdown-button-pip-size-lrg;
|
92
|
-
|
92
|
+
#{$opposite-direction}: $dropdown-button-pip-opposite-lrg;
|
93
93
|
margin-top: $dropdown-button-pip-top-lrg;
|
94
94
|
}
|
95
95
|
}
|
@@ -28,7 +28,7 @@ $f-dropdown-font-size: emCalc(14px) !default;
|
|
28
28
|
$f-dropdown-list-padding: emCalc(5px) emCalc(10px) !default;
|
29
29
|
$f-dropdown-line-height: emCalc(18px) !default;
|
30
30
|
$f-dropdown-list-hover-bg: #eeeeee !default;
|
31
|
-
$dropdown-mobile-
|
31
|
+
$dropdown-mobile-default-float: 0 !default;
|
32
32
|
|
33
33
|
// We use this to control the styles for when the dropdown has custom content.
|
34
34
|
$f-dropdown-content-padding: emCalc(20px) !default;
|
@@ -42,7 +42,6 @@ $f-dropdown-content-padding: emCalc(20px) !default;
|
|
42
42
|
// We use this to style the dropdown container element.
|
43
43
|
@mixin dropdown-container($content:list, $triangle:true, $max-width:$f-dropdown-max-width) {
|
44
44
|
position: absolute;
|
45
|
-
left: -9999px;
|
46
45
|
top: -9999px;
|
47
46
|
list-style: $f-dropdown-list-style;
|
48
47
|
|
@@ -76,14 +75,14 @@ $f-dropdown-content-padding: emCalc(20px) !default;
|
|
76
75
|
@include css-triangle($f-dropdown-triangle-size, $f-dropdown-triangle-color, bottom);
|
77
76
|
position: absolute;
|
78
77
|
top: -($f-dropdown-triangle-size * 2);
|
79
|
-
|
78
|
+
#{$default-float}: $f-dropdown-triangle-side-offset;
|
80
79
|
z-index: 99;
|
81
80
|
}
|
82
81
|
&:after {
|
83
82
|
@include css-triangle($f-dropdown-triangle-size + 1, $f-dropdown-border-color, bottom);
|
84
83
|
position: absolute;
|
85
84
|
top: -(($f-dropdown-triangle-size + 1) * 2);
|
86
|
-
|
85
|
+
#{$default-float}: $f-dropdown-triangle-side-offset - 1;
|
87
86
|
z-index: 98;
|
88
87
|
}
|
89
88
|
|
@@ -122,13 +121,13 @@ $f-dropdown-content-padding: emCalc(20px) !default;
|
|
122
121
|
@media only screen and (max-width: 767px) {
|
123
122
|
.f-dropdown {
|
124
123
|
max-width: 100%;
|
125
|
-
|
124
|
+
#{$default-float}: $dropdown-mobile-default-float;
|
126
125
|
}
|
127
126
|
}
|
128
127
|
|
129
128
|
/* Foundation Dropdowns */
|
130
129
|
.f-dropdown {
|
131
|
-
@include dropdown-container;
|
130
|
+
@include dropdown-container(content);
|
132
131
|
// max-width: none;
|
133
132
|
|
134
133
|
li { @include dropdown-style; }
|
@@ -73,7 +73,7 @@ $input-error-message-font-color-alt: #333 !default;
|
|
73
73
|
}
|
74
74
|
}
|
75
75
|
input.column,
|
76
|
-
input.columns { padding-
|
76
|
+
input.columns { padding-#{$default-float}: $form-spacing / 2; }
|
77
77
|
}
|
78
78
|
|
79
79
|
// We use this mixin to give all basic form elements their style
|
@@ -151,7 +151,7 @@ $input-error-message-font-color-alt: #333 !default;
|
|
151
151
|
$bg-lightness: lightness($bg);
|
152
152
|
background: $bg;
|
153
153
|
border-color: darken($bg, 10%);
|
154
|
-
border-
|
154
|
+
border-#{$opposite-direction}: none;
|
155
155
|
|
156
156
|
// Control the font color based on background brightness
|
157
157
|
@if $bg-lightness > 70% or $bg == yellow { color: $input-prefix-font-color; }
|
@@ -160,7 +160,7 @@ $input-error-message-font-color-alt: #333 !default;
|
|
160
160
|
|
161
161
|
@if $is-button {
|
162
162
|
padding-#{$default-float}: 0;
|
163
|
-
padding-#{$
|
163
|
+
padding-#{$opposite-direction}: 0;
|
164
164
|
padding-top: 0;
|
165
165
|
padding-bottom: 0;
|
166
166
|
text-align: center;
|
@@ -176,7 +176,7 @@ $input-error-message-font-color-alt: #333 !default;
|
|
176
176
|
$bg-lightness: lightness($bg);
|
177
177
|
background: $bg;
|
178
178
|
border-color: darken($bg, 15%);
|
179
|
-
border-
|
179
|
+
border-#{$default-float}: none;
|
180
180
|
|
181
181
|
// Control the font color based on background brightness
|
182
182
|
@if $bg-lightness > 70% or $bg == yellow { color: $input-prefix-font-color; }
|
@@ -185,7 +185,7 @@ $input-error-message-font-color-alt: #333 !default;
|
|
185
185
|
|
186
186
|
@if $is-button {
|
187
187
|
padding-#{$default-float}: 0;
|
188
|
-
padding-#{$
|
188
|
+
padding-#{$opposite-direction}: 0;
|
189
189
|
padding-top: 0;
|
190
190
|
padding-bottom: 0;
|
191
191
|
text-align: center;
|
@@ -262,35 +262,35 @@ $input-error-message-font-color-alt: #333 !default;
|
|
262
262
|
/* Adjust padding, alignment and radius if pre/post element is a button */
|
263
263
|
.postfix.button { @include button-size(false,false,false); @include postfix(false,true); }
|
264
264
|
.prefix.button { @include button-size(false,false,false); @include prefix(false,true); }
|
265
|
-
.prefix.button.radius { @include side-radius(
|
266
|
-
.postfix.button.radius { @include side-radius(
|
267
|
-
.prefix.button.round { @include side-radius(
|
268
|
-
.postfix.button.round { @include side-radius(
|
265
|
+
.prefix.button.radius { @include side-radius($default-float, $global-radius); }
|
266
|
+
.postfix.button.radius { @include side-radius($opposite-direction, $global-radius); }
|
267
|
+
.prefix.button.round { @include side-radius($default-float, 1000px); }
|
268
|
+
.postfix.button.round { @include side-radius($opposite-direction, 1000px); }
|
269
269
|
|
270
270
|
/* Separate prefix and postfix styles when on span so buttons keep their own */
|
271
271
|
span.prefix { @include prefix();
|
272
|
-
&.radius { @include side-radius(
|
272
|
+
&.radius { @include side-radius($default-float, $global-radius); }
|
273
273
|
}
|
274
274
|
span.postfix { @include postfix();
|
275
|
-
&.radius { @include side-radius(
|
275
|
+
&.radius { @include side-radius($opposite-direction, $global-radius); }
|
276
276
|
}
|
277
277
|
|
278
278
|
/* Input groups will automatically style first and last elements of the group */
|
279
279
|
.input-group {
|
280
280
|
&.radius {
|
281
281
|
&>*:first-child, &>*:first-child * {
|
282
|
-
@include side-radius(
|
282
|
+
@include side-radius($default-float, $global-radius);
|
283
283
|
}
|
284
284
|
&>*:last-child, &>*:last-child * {
|
285
|
-
@include side-radius(
|
285
|
+
@include side-radius($opposite-direction, $global-radius);
|
286
286
|
}
|
287
287
|
}
|
288
288
|
&.round {
|
289
289
|
&>*:first-child, &>*:first-child * {
|
290
|
-
@include side-radius(
|
290
|
+
@include side-radius($default-float, $button-round);
|
291
291
|
}
|
292
292
|
&>*:last-child, &>*:last-child * {
|
293
|
-
@include side-radius(
|
293
|
+
@include side-radius($opposite-direction, $button-round);
|
294
294
|
}
|
295
295
|
}
|
296
296
|
}
|
@@ -15,8 +15,8 @@ $total-columns: 12 !default;
|
|
15
15
|
// use @include grid-row(nest); to include a nested row
|
16
16
|
@if $behavior == nest {
|
17
17
|
width: auto;
|
18
|
-
margin-
|
19
|
-
margin-
|
18
|
+
margin-#{$default-float}: -($column-gutter/2);
|
19
|
+
margin-#{$opposite-direction}: -($column-gutter/2);
|
20
20
|
margin-top: 0;
|
21
21
|
margin-bottom: 0;
|
22
22
|
max-width: none;
|
@@ -39,8 +39,8 @@ $total-columns: 12 !default;
|
|
39
39
|
// use @include grid-row; to use a container row
|
40
40
|
@else {
|
41
41
|
width: 100%;
|
42
|
-
margin-
|
43
|
-
margin-
|
42
|
+
margin-#{$default-float}: auto;
|
43
|
+
margin-#{$opposite-direction}: auto;
|
44
44
|
margin-top: 0;
|
45
45
|
margin-bottom: 0;
|
46
46
|
max-width: $row-width;
|
@@ -53,14 +53,14 @@ $total-columns: 12 !default;
|
|
53
53
|
|
54
54
|
|
55
55
|
// For creating columns - @include these inside a media query to control small vs. large grid layouts
|
56
|
-
@mixin grid-column($columns:false, $last-column:false, $center:false, $offset:false, $push:false, $pull:false, $collapse:false, $float
|
56
|
+
@mixin grid-column($columns:false, $last-column:false, $center:false, $offset:false, $push:false, $pull:false, $collapse:false, $float:$default-float) {
|
57
57
|
|
58
58
|
position: relative;
|
59
59
|
|
60
60
|
// Gutter padding whenever a column isn't set to collapse
|
61
61
|
@if $collapse == false {
|
62
|
-
padding-
|
63
|
-
padding-
|
62
|
+
padding-#{$default-float}: $column-gutter / 2;
|
63
|
+
padding-#{$opposite-direction}: $column-gutter / 2;
|
64
64
|
}
|
65
65
|
|
66
66
|
// If a column number is given, calculate width
|
@@ -68,32 +68,32 @@ $total-columns: 12 !default;
|
|
68
68
|
width: gridCalc($columns, $total-columns);
|
69
69
|
|
70
70
|
// If last column, float naturally instead of to the right
|
71
|
-
@if $last-column { float: $
|
71
|
+
@if $last-column { float: $opposite-direction; }
|
72
72
|
|
73
73
|
// if collapsed, get rid of gutter padding
|
74
|
-
@else if $collapse { padding-
|
74
|
+
@else if $collapse { padding-#{$default-float}: 0; padding-#{$opposite-direction}: 0; }
|
75
75
|
|
76
76
|
}
|
77
77
|
|
78
|
-
@if $collapse { padding-
|
78
|
+
@if $collapse { padding-#{$default-float}: 0; padding-#{$opposite-direction}: 0; }
|
79
79
|
|
80
80
|
// If offset, calculate appropriate margins
|
81
81
|
@if $offset { margin-#{$default-float}: gridCalc($offset, $total-columns); }
|
82
82
|
|
83
83
|
// Source Ordering, adds left/right depending on which you use.
|
84
|
-
@if $push { #{$default-float}: gridCalc($push, $total-columns); #{$
|
85
|
-
@if $pull { #{$
|
84
|
+
@if $push { #{$default-float}: gridCalc($push, $total-columns); #{$opposite-direction}: auto; }
|
85
|
+
@if $pull { #{$opposite-direction}: gridCalc($pull, $total-columns); #{$default-float}: auto; }
|
86
86
|
|
87
87
|
// If centered, get rid of float and add appropriate margins
|
88
88
|
@if $center {
|
89
|
-
margin-
|
90
|
-
margin-
|
89
|
+
margin-#{$default-float}: auto;
|
90
|
+
margin-#{$opposite-direction}: auto;
|
91
91
|
float: none !important;
|
92
92
|
}
|
93
93
|
|
94
94
|
@if $float {
|
95
95
|
@if $float == left or true { float: $default-float; }
|
96
|
-
@else if $float == right { float: $
|
96
|
+
@else if $float == right { float: $opposite-direction; }
|
97
97
|
@else { float: none; }
|
98
98
|
}
|
99
99
|
|
@@ -132,7 +132,7 @@ $total-columns: 12 !default;
|
|
132
132
|
.row .small-offset-#{$i} { @include grid-column($offset:$i, $collapse:null,$float:false); }
|
133
133
|
}
|
134
134
|
|
135
|
-
[class*="column"] + [class*="column"]:last-child { float: $
|
135
|
+
[class*="column"] + [class*="column"]:last-child { float: $opposite-direction; }
|
136
136
|
[class*="column"] + [class*="column"].end { float: $default-float; }
|
137
137
|
|
138
138
|
.column.small-centered,
|
@@ -156,8 +156,8 @@ $total-columns: 12 !default;
|
|
156
156
|
}
|
157
157
|
|
158
158
|
@for $i from 2 through $total-columns - 2 {
|
159
|
-
.small-push#{-$i} {
|
160
|
-
.small-pull#{-$i} {
|
159
|
+
.small-push#{-$i} { #{$default-float}: inherit; }
|
160
|
+
.small-pull#{-$i} { #{$opposite-direction}: inherit; }
|
161
161
|
}
|
162
162
|
|
163
163
|
.column.large-centered,
|
@@ -3,8 +3,11 @@
|
|
3
3
|
//
|
4
4
|
|
5
5
|
// We use this to control the margins and padding of the inline list.
|
6
|
-
$inline-list-margin
|
7
|
-
$inline-list-margin:
|
6
|
+
$inline-list-top-margin: 0 !default;
|
7
|
+
$inline-list-opposite-margin: 0 !default;
|
8
|
+
$inline-list-bottom-margin: emCalc(17px) !default;
|
9
|
+
$inline-list-default-float-margin: emCalc(-22px) !default;
|
10
|
+
|
8
11
|
$inline-list-padding: 0 !default;
|
9
12
|
|
10
13
|
// We use this to control the overflow of the inline list.
|
@@ -22,7 +25,9 @@ $inline-list-children-display: block !default;
|
|
22
25
|
|
23
26
|
// We use this mixin to create inline lists
|
24
27
|
@mixin inline-list {
|
25
|
-
margin: $inline-list-margin $inline-list-margin
|
28
|
+
margin: $inline-list-top-margin auto $inline-list-bottom-margin auto;
|
29
|
+
margin-#{$default-float}: $inline-list-default-float-margin;
|
30
|
+
margin-#{$opposite-direction}: $inline-list-opposite-margin;
|
26
31
|
padding: $inline-list-padding;
|
27
32
|
list-style: none;
|
28
33
|
overflow: $inline-list-overflow;
|