zurb-foundation 4.3.1 → 4.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.gitignore +4 -0
- data/Gemfile.lock +31 -2
- data/Gruntfile.js +54 -10
- data/LICENSE +2 -2
- data/README.md +11 -2
- data/Rakefile +9 -0
- data/docs/CHANGELOG.md +9 -0
- data/docs/Procfile +2 -2
- data/docs/components/abide.html.erb +30 -6
- data/docs/components/alert-boxes.html.erb +35 -10
- data/docs/components/block-grid.html.erb +1 -1
- data/docs/components/breadcrumbs.html.erb +4 -4
- data/docs/components/button-groups.html.erb +2 -2
- data/docs/components/buttons.html.erb +10 -10
- data/docs/components/clearing.html.erb +28 -2
- data/docs/components/custom-forms.html.erb +9 -1
- data/docs/components/dropdown-buttons.html.erb +36 -11
- data/docs/components/dropdown.html.erb +44 -13
- data/docs/components/flex-video.html.erb +3 -3
- data/docs/components/forms.html.erb +10 -10
- data/docs/components/global.html.erb +15 -20
- data/docs/components/grid.html.erb +24 -23
- data/docs/components/inline-lists.html.erb +3 -3
- data/docs/components/interchange.html.erb +28 -2
- data/docs/components/joyride.html.erb +34 -10
- data/docs/components/keystrokes.html.erb +3 -3
- data/docs/components/kitchen-sink.html.erb +1 -1
- data/docs/components/labels.html.erb +3 -3
- data/docs/components/magellan.html.erb +25 -2
- data/docs/components/orbit.html.erb +39 -9
- data/docs/components/pagination.html.erb +7 -7
- data/docs/components/panels.html.erb +3 -3
- data/docs/components/pricing-tables.html.erb +11 -11
- data/docs/components/progress-bars.html.erb +5 -5
- data/docs/components/reveal.html.erb +31 -8
- data/docs/components/section.html.erb +61 -37
- data/docs/components/side-nav.html.erb +4 -4
- data/docs/components/split-buttons.html.erb +37 -15
- data/docs/components/sub-nav.html.erb +10 -6
- data/docs/components/switch.html.erb +2 -2
- data/docs/components/tables.html.erb +7 -7
- data/docs/components/tooltips.html.erb +30 -6
- data/docs/components/top-bar.html.erb +101 -13
- data/docs/components/type.html.erb +16 -16
- data/docs/config.ru +18 -1
- data/docs/controller.rb +1 -1
- data/docs/css/_coderay.scss +2 -2
- data/docs/css/_footer.scss +7 -7
- data/docs/css/_offcanvas.scss +16 -16
- data/docs/css/docs.scss +1 -3
- data/docs/index.html.erb +29 -29
- data/docs/layout.html.erb +5 -5
- data/docs/media-queries.html.erb +3 -3
- data/docs/rails.html.erb +2 -1
- data/docs/sass.html.erb +188 -146
- data/docs/support.html.erb +2 -2
- data/foundation.gemspec +1 -0
- data/js/foundation/foundation.abide.js +5 -5
- data/js/foundation/foundation.alerts.js +9 -4
- data/js/foundation/foundation.clearing.js +2 -2
- data/js/foundation/foundation.dropdown.js +11 -5
- data/js/foundation/foundation.forms.js +51 -28
- data/js/foundation/foundation.joyride.js +7 -5
- data/js/foundation/foundation.js +25 -1
- data/js/foundation/foundation.magellan.js +3 -2
- data/js/foundation/foundation.orbit.js +78 -58
- data/js/foundation/foundation.placeholder.js +424 -177
- data/js/foundation/foundation.reveal.js +39 -16
- data/js/foundation/foundation.section.js +62 -32
- data/js/foundation/foundation.tooltips.js +3 -2
- data/js/foundation/foundation.topbar.js +139 -69
- data/lib/foundation/generators/templates/application.html.erb +2 -1
- data/lib/foundation/version.rb +1 -1
- data/lib/zurb-foundation.rb +12 -0
- data/package.json +4 -3
- data/scss/foundation/_variables.scss +183 -159
- data/scss/foundation/components/_alert-boxes.scss +8 -8
- data/scss/foundation/components/_block-grid.scss +1 -1
- data/scss/foundation/components/_breadcrumbs.scss +3 -3
- data/scss/foundation/components/_button-groups.scss +2 -2
- data/scss/foundation/components/_buttons.scss +20 -20
- data/scss/foundation/components/_custom-forms.scss +19 -14
- data/scss/foundation/components/_dropdown-buttons.scss +8 -8
- data/scss/foundation/components/_dropdown.scss +4 -4
- data/scss/foundation/components/_flex-video.scss +2 -2
- data/scss/foundation/components/_forms.scss +28 -18
- data/scss/foundation/components/_global.scss +43 -18
- data/scss/foundation/components/_grid-5.scss +4 -4
- data/scss/foundation/components/_grid.scss +6 -4
- data/scss/foundation/components/_inline-lists.scss +3 -3
- data/scss/foundation/components/_joyride.scss +10 -10
- data/scss/foundation/components/_keystrokes.scss +2 -2
- data/scss/foundation/components/_labels.scss +2 -2
- data/scss/foundation/components/_orbit.scss +58 -44
- data/scss/foundation/components/_pagination.scss +6 -6
- data/scss/foundation/components/_panels.scss +7 -4
- data/scss/foundation/components/_pricing-tables.scss +10 -10
- data/scss/foundation/components/_progress-bars.scss +3 -3
- data/scss/foundation/components/_reveal.scss +5 -5
- data/scss/foundation/components/_section.scss +21 -21
- data/scss/foundation/components/_side-nav.scss +3 -3
- data/scss/foundation/components/_split-buttons.scss +7 -7
- data/scss/foundation/components/_sub-nav.scss +26 -10
- data/scss/foundation/components/_switch.scss +15 -11
- data/scss/foundation/components/_tables.scss +6 -6
- data/scss/foundation/components/_thumbs.scss +2 -4
- data/scss/foundation/components/_tooltips.scss +4 -4
- data/scss/foundation/components/_top-bar.scss +77 -39
- data/scss/foundation/components/_type.scss +25 -23
- data/scss/foundation/components/_visibility.scss +28 -28
- data/scss/normalize.scss +22 -14
- data/spec/js/SectionSpec.js +39 -0
- data/spec/js/helpers/SectionSpecHelper.js +22 -0
- data/spec/js/helpers/SpecHelper.js +19 -0
- metadata +32 -25
- data/.rbenv-version +0 -1
@@ -14,7 +14,7 @@ $switch-height-tny: 22px !default;
|
|
14
14
|
$switch-height-sml: 28px !default;
|
15
15
|
$switch-height-med: 36px !default;
|
16
16
|
$switch-height-lrg: 44px !default;
|
17
|
-
$switch-bottom-margin:
|
17
|
+
$switch-bottom-margin: em-calc(20) !default;
|
18
18
|
|
19
19
|
// We use these to control default font sizes for our classes.
|
20
20
|
$switch-font-size-tny: 11px !default;
|
@@ -47,7 +47,6 @@ $switch-label-outline: 1px dotted #888 !default;
|
|
47
47
|
|
48
48
|
// Default position and structure for switch container.
|
49
49
|
position: relative;
|
50
|
-
width: 100%;
|
51
50
|
padding: 0;
|
52
51
|
display: block;
|
53
52
|
overflow: hidden;
|
@@ -127,7 +126,13 @@ $switch-label-outline: 1px dotted #888 !default;
|
|
127
126
|
|
128
127
|
// Bugfix for older Webkit, including mobile Webkit. Adapted from:
|
129
128
|
// http://css-tricks.com/webkit-sibling-bug/
|
130
|
-
@
|
129
|
+
@media only screen and (-webkit-min-device-pixel-ratio:0) and (max-device-width:480px) {
|
130
|
+
@if $experimental { -webkit-animation: webkitSiblingBugfix infinite 1s; }
|
131
|
+
}
|
132
|
+
|
133
|
+
@media only screen and (-webkit-min-device-pixel-ratio:1.5) {
|
134
|
+
@if $experimental { -webkit-animation: none 0; }
|
135
|
+
}
|
131
136
|
|
132
137
|
form.custom & .hidden-field {
|
133
138
|
margin-left: auto;
|
@@ -139,25 +144,25 @@ $switch-label-outline: 1px dotted #888 !default;
|
|
139
144
|
// We use this mixin to create the size styles for switches.
|
140
145
|
@mixin switch-size($height:$switch-height-med, $font-size:$switch-font-size-med, $line-height:2.3em) {
|
141
146
|
|
142
|
-
height: $height;
|
147
|
+
height: em-calc($height);
|
143
148
|
|
144
149
|
label {
|
145
|
-
padding:
|
150
|
+
padding: em-calc(0, $switch-label-side-padding);
|
146
151
|
line-height: $line-height;
|
147
|
-
font-size:
|
152
|
+
font-size: em-calc($font-size);
|
148
153
|
}
|
149
154
|
|
150
155
|
input {
|
151
156
|
// Move the paddle to the right position
|
152
157
|
&:first-of-type:checked ~ span:last-child {
|
153
158
|
#{$default-float}: 100%;
|
154
|
-
margin-#{$default-float}:
|
159
|
+
margin-#{$default-float}: em-calc(-$height + 1px);
|
155
160
|
}
|
156
161
|
}
|
157
162
|
|
158
163
|
span:last-child {
|
159
|
-
width:
|
160
|
-
height:
|
164
|
+
width: em-calc($height);
|
165
|
+
height: em-calc($height);
|
161
166
|
}
|
162
167
|
|
163
168
|
}
|
@@ -251,12 +256,11 @@ $switch-label-outline: 1px dotted #888 !default;
|
|
251
256
|
// Make the switch completely round, like a pill
|
252
257
|
&.round { @include radius(1000px);
|
253
258
|
span:last-child { @include radius(999px); }
|
254
|
-
label { padding:
|
259
|
+
label { padding: em-calc(0 $switch-label-side-padding + 3); }
|
255
260
|
}
|
256
261
|
|
257
262
|
}
|
258
263
|
|
259
264
|
@if $experimental { @-webkit-keyframes webkitSiblingBugfix { from { position: relative; } to { position: relative; } } }
|
260
|
-
|
261
265
|
}
|
262
266
|
}
|
@@ -14,20 +14,20 @@ $table-border-color: #ddd !default;
|
|
14
14
|
|
15
15
|
// These control the table head styles
|
16
16
|
$table-head-bg: #f5f5f5 !default;
|
17
|
-
$table-head-font-size:
|
17
|
+
$table-head-font-size: em-calc(14) !default;
|
18
18
|
$table-head-font-color: #222 !default;
|
19
19
|
$table-head-font-weight: bold !default;
|
20
|
-
$table-head-padding:
|
20
|
+
$table-head-padding: em-calc(8 10 10) !default;
|
21
21
|
|
22
22
|
// These control the row padding and font styles
|
23
|
-
$table-row-padding:
|
24
|
-
$table-row-font-size:
|
23
|
+
$table-row-padding: em-calc(9 10) !default;
|
24
|
+
$table-row-font-size: em-calc(14) !default;
|
25
25
|
$table-row-font-color: #222 !default;
|
26
|
-
$table-line-height:
|
26
|
+
$table-line-height: em-calc(18) !default;
|
27
27
|
|
28
28
|
// These are for controlling the display and margin of tables
|
29
29
|
$table-display: table-cell !default;
|
30
|
-
$table-margin-bottom:
|
30
|
+
$table-margin-bottom: em-calc(20) !default;
|
31
31
|
|
32
32
|
|
33
33
|
//
|
@@ -10,16 +10,16 @@ $has-tip-border-bottom-hover: dotted 1px darken($primary-color, 20%) !default;
|
|
10
10
|
$has-tip-font-color-hover: $primary-color !default;
|
11
11
|
$has-tip-cursor-type: help !default;
|
12
12
|
|
13
|
-
$tooltip-padding:
|
13
|
+
$tooltip-padding: em-calc(8) !default;
|
14
14
|
$tooltip-bg: #000 !default;
|
15
|
-
$tooltip-font-size:
|
15
|
+
$tooltip-font-size: em-calc(15) !default;
|
16
16
|
$tooltip-font-weight: bold !default;
|
17
17
|
$tooltip-font-color: #fff !default;
|
18
18
|
$tooltip-line-height: 1.3 !default;
|
19
|
-
$tooltip-close-font-size:
|
19
|
+
$tooltip-close-font-size: em-calc(10) !default;
|
20
20
|
$tooltip-close-font-weight: normal !default;
|
21
21
|
$tooltip-close-font-color: #888 !default;
|
22
|
-
$tooltip-font-size-sml:
|
22
|
+
$tooltip-font-size-sml: em-calc(14) !default;
|
23
23
|
$tooltip-radius: $global-radius !default;
|
24
24
|
$tooltip-pip-size: 5px !default;
|
25
25
|
|
@@ -4,23 +4,24 @@
|
|
4
4
|
$include-html-top-bar-classes: $include-html-classes !default;
|
5
5
|
|
6
6
|
// Background color for the top bar
|
7
|
-
$topbar-bg: #111 !default;
|
7
|
+
$topbar-bg-color: #111 !default;
|
8
|
+
$topbar-bg: $topbar-bg-color !default;
|
8
9
|
|
9
10
|
// Height and margin
|
10
11
|
$topbar-height: 45px !default;
|
11
|
-
$topbar-margin-bottom:
|
12
|
+
$topbar-margin-bottom: 0 !default;
|
12
13
|
|
13
14
|
// Control Input height for top bar
|
14
15
|
$topbar-input-height: 2.45em !default;
|
15
16
|
|
16
17
|
// Controlling the styles for the title in the top bar
|
17
18
|
$topbar-title-weight: bold !default;
|
18
|
-
$topbar-title-font-size:
|
19
|
+
$topbar-title-font-size: em-calc(17) !default;
|
19
20
|
|
20
21
|
// Style the top bar dropdown elements
|
21
22
|
$topbar-dropdown-bg: #222 !default;
|
22
23
|
$topbar-dropdown-link-color: #fff !default;
|
23
|
-
$topbar-dropdown-link-bg: lighten($topbar-bg, 5%) !default;
|
24
|
+
$topbar-dropdown-link-bg: lighten($topbar-bg-color, 5%) !default;
|
24
25
|
$topbar-dropdown-toggle-size: 5px !default;
|
25
26
|
$topbar-dropdown-toggle-color: #fff !default;
|
26
27
|
$topbar-dropdown-toggle-alpha: 0.5 !default;
|
@@ -30,19 +31,21 @@ $topbar-link-color: #fff !default;
|
|
30
31
|
$topbar-link-color-hover: #fff !default;
|
31
32
|
$topbar-link-color-active: #fff !default;
|
32
33
|
$topbar-link-weight: bold !default;
|
33
|
-
$topbar-link-font-size:
|
34
|
+
$topbar-link-font-size: em-calc(13) !default;
|
34
35
|
$topbar-link-hover-lightness: -30% !default; // Darken by 30%
|
35
|
-
$topbar-link-bg-hover:
|
36
|
-
$topbar-link-bg-active: darken($topbar-bg, 3%) !default;
|
36
|
+
$topbar-link-bg-hover: adjust-color($topbar-dropdown-bg, $lightness: $topbar-link-hover-lightness) !default;
|
37
|
+
$topbar-link-bg-active: darken($topbar-bg-color, 3%) !default;
|
38
|
+
|
37
39
|
|
38
40
|
$topbar-dropdown-label-color: #555 !default;
|
39
41
|
$topbar-dropdown-label-text-transform: uppercase !default;
|
40
42
|
$topbar-dropdown-label-font-weight: bold !default;
|
41
|
-
$topbar-dropdown-label-font-size:
|
43
|
+
$topbar-dropdown-label-font-size: em-calc(10) !default;
|
44
|
+
$topbar-dropdown-label-bg: lighten($topbar-bg-color, 5%) !default;
|
42
45
|
|
43
46
|
// Top menu icon styles
|
44
47
|
$topbar-menu-link-transform: uppercase !default;
|
45
|
-
$topbar-menu-link-font-size:
|
48
|
+
$topbar-menu-link-font-size: em-calc(13) !default;
|
46
49
|
$topbar-menu-link-weight: bold !default;
|
47
50
|
$topbar-menu-link-color: #fff !default;
|
48
51
|
$topbar-menu-icon-color: #fff !default;
|
@@ -51,15 +54,17 @@ $topbar-menu-icon-color-toggled: #888 !default;
|
|
51
54
|
|
52
55
|
// Transitions and breakpoint styles
|
53
56
|
$topbar-transition-speed: 300ms !default;
|
54
|
-
|
57
|
+
// Using em-calc for the below breakpoint causes issues with top bar
|
58
|
+
$topbar-breakpoint: 940px !default; // Change to 9999px for always mobile layout
|
55
59
|
$topbar-media-query: "only screen and (min-width: #{$topbar-breakpoint})" !default;
|
56
60
|
|
57
61
|
// Divider Styles
|
58
|
-
$topbar-divider-border-bottom: solid 1px lighten($topbar-bg, 10%) !default;
|
59
|
-
$topbar-divider-border-top: solid 1px darken($topbar-bg, 10%) !default;
|
62
|
+
$topbar-divider-border-bottom: solid 1px lighten($topbar-bg-color, 10%) !default;
|
63
|
+
$topbar-divider-border-top: solid 1px darken($topbar-bg-color, 10%) !default;
|
60
64
|
|
61
65
|
// Sticky Class
|
62
66
|
$topbar-sticky-class: ".sticky" !default;
|
67
|
+
$topbar-arrows: true !default; //Set false to remove the triangle icon from the menu item
|
63
68
|
|
64
69
|
@if $include-html-top-bar-classes != false {
|
65
70
|
|
@@ -78,6 +83,24 @@ $topbar-sticky-class: ".sticky" !default;
|
|
78
83
|
position: fixed;
|
79
84
|
top: 0;
|
80
85
|
z-index: 99;
|
86
|
+
|
87
|
+
&.expanded:not(.top-bar) {
|
88
|
+
overflow-y: auto;
|
89
|
+
height: auto;
|
90
|
+
width: 100%;
|
91
|
+
max-height: 100%;
|
92
|
+
|
93
|
+
.title-area {
|
94
|
+
position: fixed;
|
95
|
+
width: 100%;
|
96
|
+
z-index: 99;
|
97
|
+
}
|
98
|
+
// Ensure you can scroll the menu on small screens
|
99
|
+
.top-bar-section {
|
100
|
+
z-index: 98;
|
101
|
+
margin-top: $topbar-height;
|
102
|
+
}
|
103
|
+
}
|
81
104
|
}
|
82
105
|
|
83
106
|
.top-bar {
|
@@ -246,25 +269,27 @@ $topbar-sticky-class: ".sticky" !default;
|
|
246
269
|
&.button {
|
247
270
|
background: $primary-color;
|
248
271
|
font-size: $topbar-link-font-size;
|
249
|
-
|
272
|
+
padding-right: $topbar-height / 3;
|
273
|
+
padding-left: $topbar-height / 3;
|
274
|
+
&:hover {
|
250
275
|
background: darken($primary-color, 10%);
|
251
276
|
}
|
252
277
|
}
|
253
278
|
&.button.secondary {
|
254
279
|
background: $secondary-color;
|
255
|
-
|
280
|
+
&:hover {
|
256
281
|
background: darken($secondary-color, 10%);
|
257
282
|
}
|
258
283
|
}
|
259
284
|
&.button.success {
|
260
285
|
background: $success-color;
|
261
|
-
|
286
|
+
&:hover {
|
262
287
|
background: darken($success-color, 10%);
|
263
288
|
}
|
264
289
|
}
|
265
290
|
&.button.alert {
|
266
291
|
background: $alert-color;
|
267
|
-
|
292
|
+
&:hover {
|
268
293
|
background: darken($alert-color, 10%);
|
269
294
|
}
|
270
295
|
}
|
@@ -272,7 +297,7 @@ $topbar-sticky-class: ".sticky" !default;
|
|
272
297
|
}
|
273
298
|
|
274
299
|
// Apply the hover link color when it has that class
|
275
|
-
|
300
|
+
&:hover > a {
|
276
301
|
background: $topbar-link-bg-hover;
|
277
302
|
color: $topbar-link-color-hover;
|
278
303
|
}
|
@@ -293,7 +318,9 @@ $topbar-sticky-class: ".sticky" !default;
|
|
293
318
|
|
294
319
|
& > a {
|
295
320
|
&:after {
|
296
|
-
@
|
321
|
+
@if ($topbar-arrows){
|
322
|
+
@include css-triangle($topbar-dropdown-toggle-size, rgba($topbar-dropdown-toggle-color, $topbar-dropdown-toggle-alpha), $default-float);
|
323
|
+
}
|
297
324
|
margin-#{$opposite-direction}: $topbar-height / 3;
|
298
325
|
margin-top: -($topbar-dropdown-toggle-size / 2) - 2;
|
299
326
|
position: absolute;
|
@@ -304,7 +331,7 @@ $topbar-sticky-class: ".sticky" !default;
|
|
304
331
|
|
305
332
|
&.moved { position: static;
|
306
333
|
& > .dropdown {
|
307
|
-
|
334
|
+
display: block;
|
308
335
|
}
|
309
336
|
}
|
310
337
|
}
|
@@ -314,7 +341,7 @@ $topbar-sticky-class: ".sticky" !default;
|
|
314
341
|
position: absolute;
|
315
342
|
#{$default-float}: 100%;
|
316
343
|
top: 0;
|
317
|
-
|
344
|
+
display: none;
|
318
345
|
z-index: 99;
|
319
346
|
|
320
347
|
li {
|
@@ -372,7 +399,7 @@ $topbar-sticky-class: ".sticky" !default;
|
|
372
399
|
input,
|
373
400
|
.button {
|
374
401
|
line-height: 2em;
|
375
|
-
font-size:
|
402
|
+
font-size: em-calc(14);
|
376
403
|
height: 2em;
|
377
404
|
padding: 0 10px;
|
378
405
|
position: relative;
|
@@ -404,32 +431,42 @@ $topbar-sticky-class: ".sticky" !default;
|
|
404
431
|
}
|
405
432
|
|
406
433
|
li {
|
434
|
+
&.hover {
|
435
|
+
> a:not(.button) {
|
436
|
+
background: $topbar-link-bg-hover;
|
437
|
+
color: $topbar-link-color-hover;
|
438
|
+
}
|
439
|
+
}
|
407
440
|
a:not(.button) {
|
408
441
|
padding: 0 $topbar-height / 3;
|
409
442
|
line-height: $topbar-height;
|
410
443
|
background: $topbar-bg;
|
411
|
-
|
444
|
+
&:hover { background: $topbar-link-bg-hover; }
|
412
445
|
}
|
413
446
|
}
|
414
447
|
|
415
448
|
.has-dropdown {
|
416
|
-
& > a {
|
417
|
-
padding-#{$opposite-direction}: $topbar-height / 3 + 20 !important;
|
418
449
|
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
|
450
|
+
@if($topbar-arrows){
|
451
|
+
|
452
|
+
& > a {
|
453
|
+
padding-#{$opposite-direction}: $topbar-height / 3 + 20 !important;
|
454
|
+
&:after {
|
455
|
+
@include css-triangle($topbar-dropdown-toggle-size, rgba($topbar-dropdown-toggle-color, $topbar-dropdown-toggle-alpha), top);
|
456
|
+
margin-top: -($topbar-dropdown-toggle-size / 2);
|
457
|
+
top: $topbar-height / 2;
|
458
|
+
}
|
423
459
|
}
|
460
|
+
|
424
461
|
}
|
425
462
|
|
426
463
|
&.moved { position: relative;
|
427
|
-
& > .dropdown {
|
464
|
+
& > .dropdown { display: none; }
|
428
465
|
}
|
429
466
|
|
430
467
|
&.hover, &.not-click:hover {
|
431
468
|
& > .dropdown {
|
432
|
-
|
469
|
+
display: block;
|
433
470
|
}
|
434
471
|
}
|
435
472
|
|
@@ -438,7 +475,8 @@ $topbar-sticky-class: ".sticky" !default;
|
|
438
475
|
&:after {
|
439
476
|
border: none;
|
440
477
|
content: "\00bb";
|
441
|
-
|
478
|
+
top: 1em;
|
479
|
+
margin-top: -7px;
|
442
480
|
#{$opposite-direction}: 5px;
|
443
481
|
}
|
444
482
|
}
|
@@ -463,7 +501,7 @@ $topbar-sticky-class: ".sticky" !default;
|
|
463
501
|
|
464
502
|
label {
|
465
503
|
white-space: nowrap;
|
466
|
-
background:
|
504
|
+
background: $topbar-dropdown-label-bg;
|
467
505
|
}
|
468
506
|
|
469
507
|
// Second Level Dropdowns
|
@@ -482,7 +520,7 @@ $topbar-sticky-class: ".sticky" !default;
|
|
482
520
|
border-#{$default-float}: $topbar-divider-border-top;
|
483
521
|
clear: none;
|
484
522
|
height: $topbar-height;
|
485
|
-
width:
|
523
|
+
width: 0;
|
486
524
|
}
|
487
525
|
|
488
526
|
.has-form {
|
@@ -501,8 +539,8 @@ $topbar-sticky-class: ".sticky" !default;
|
|
501
539
|
}
|
502
540
|
}
|
503
541
|
}
|
504
|
-
|
505
|
-
// Degrade gracefully when Javascript is disabled. Displays dropdown and changes
|
542
|
+
|
543
|
+
// Degrade gracefully when Javascript is disabled. Displays dropdown and changes
|
506
544
|
// background & text color on hover.
|
507
545
|
.no-js .top-bar-section {
|
508
546
|
ul li {
|
@@ -517,16 +555,16 @@ $topbar-sticky-class: ".sticky" !default;
|
|
517
555
|
background: $topbar-link-bg-active;
|
518
556
|
color: $topbar-link-color-active;
|
519
557
|
}
|
520
|
-
}
|
521
|
-
|
558
|
+
}
|
559
|
+
|
522
560
|
.has-dropdown {
|
523
561
|
&:hover {
|
524
562
|
& > .dropdown {
|
525
|
-
|
563
|
+
display: block;
|
526
564
|
}
|
527
565
|
}
|
528
566
|
}
|
529
|
-
}
|
567
|
+
}
|
530
568
|
}
|
531
569
|
|
532
570
|
}
|
@@ -14,11 +14,11 @@ $header-bottom-margin: .5em !default;
|
|
14
14
|
$header-text-rendering: optimizeLegibility !default;
|
15
15
|
|
16
16
|
// We use these to control header font sizes
|
17
|
-
$h1-font-size:
|
18
|
-
$h2-font-size:
|
19
|
-
$h3-font-size:
|
20
|
-
$h4-font-size:
|
21
|
-
$h5-font-size:
|
17
|
+
$h1-font-size: em-calc(44) !default;
|
18
|
+
$h2-font-size: em-calc(37) !default;
|
19
|
+
$h3-font-size: em-calc(27) !default;
|
20
|
+
$h4-font-size: em-calc(23) !default;
|
21
|
+
$h5-font-size: em-calc(18) !default;
|
22
22
|
$h6-font-size: 1em !default;
|
23
23
|
|
24
24
|
// These control how subheaders are styled.
|
@@ -37,8 +37,8 @@ $paragraph-font-family: inherit !default;
|
|
37
37
|
$paragraph-font-weight: normal !default;
|
38
38
|
$paragraph-font-size: 1em !default;
|
39
39
|
$paragraph-line-height: 1.6 !default;
|
40
|
-
$paragraph-margin-bottom:
|
41
|
-
$paragraph-aside-font-size:
|
40
|
+
$paragraph-margin-bottom: em-calc(20) !default;
|
41
|
+
$paragraph-aside-font-size: em-calc(14) !default;
|
42
42
|
$paragraph-aside-line-height: 1.35 !default;
|
43
43
|
$paragraph-aside-font-style: italic !default;
|
44
44
|
$paragraph-text-rendering: optimizeLegibility !default;
|
@@ -57,21 +57,22 @@ $anchor-font-color-hover: darken($primary-color, 5%) !default;
|
|
57
57
|
$hr-border-width: 1px !default;
|
58
58
|
$hr-border-style: solid !default;
|
59
59
|
$hr-border-color: #ddd !default;
|
60
|
-
$hr-margin:
|
60
|
+
$hr-margin: em-calc(20) !default;
|
61
61
|
|
62
62
|
// We use these to style lists
|
63
63
|
$list-style-position: outside !default;
|
64
64
|
$list-side-margin: 0 !default;
|
65
|
-
$list-
|
65
|
+
$list-side-margin-no-bullet: $list-side-margin;
|
66
|
+
$list-nested-margin: em-calc(20) !default;
|
66
67
|
$definition-list-header-weight: bold !default;
|
67
68
|
$definition-list-header-margin-bottom: .3em !default;
|
68
|
-
$definition-list-margin-bottom:
|
69
|
+
$definition-list-margin-bottom: em-calc(12) !default;
|
69
70
|
|
70
71
|
// We use these to style blockquotes
|
71
72
|
$blockquote-font-color: lighten($header-font-color, 30%) !default;
|
72
|
-
$blockquote-padding:
|
73
|
+
$blockquote-padding: em-calc(9 20 0 19) !default;
|
73
74
|
$blockquote-border: 1px solid #ddd !default;
|
74
|
-
$blockquote-cite-font-size:
|
75
|
+
$blockquote-cite-font-size: em-calc(13) !default;
|
75
76
|
$blockquote-cite-font-color: lighten($header-font-color, 20%) !default;
|
76
77
|
$blockquote-cite-link-color: $blockquote-cite-font-color !default;
|
77
78
|
|
@@ -79,8 +80,8 @@ $blockquote-cite-link-color: $blockquote-cite-font-color !default;
|
|
79
80
|
$acronym-underline: 1px dotted #ddd !default;
|
80
81
|
|
81
82
|
// We use these to control padding and margin
|
82
|
-
$microformat-padding:
|
83
|
-
$microformat-margin:
|
83
|
+
$microformat-padding: em-calc(10 12) !default;
|
84
|
+
$microformat-margin: em-calc(0 0 20 0) !default;
|
84
85
|
|
85
86
|
// We use these to control the border styles
|
86
87
|
$microformat-border-width: 1px !default;
|
@@ -89,13 +90,13 @@ $microformat-border-color: #ddd !default;
|
|
89
90
|
|
90
91
|
// We use these to control full name font styles
|
91
92
|
$microformat-fullname-font-weight: bold !default;
|
92
|
-
$microformat-fullname-font-size:
|
93
|
+
$microformat-fullname-font-size: em-calc(15) !default;
|
93
94
|
|
94
95
|
// We use this to control the summary font styles
|
95
96
|
$microformat-summary-font-weight: bold !default;
|
96
97
|
|
97
98
|
// We use this to control abbr padding
|
98
|
-
$microformat-abbr-padding:
|
99
|
+
$microformat-abbr-padding: em-calc(0 1) !default;
|
99
100
|
|
100
101
|
// We use this to control abbr font styles
|
101
102
|
$microformat-abbr-font-weight: bold !default;
|
@@ -108,7 +109,7 @@ $microformat-abbr-font-decoration: none !default;
|
|
108
109
|
|
109
110
|
// These will throw a deprecation warning if used within a media query.
|
110
111
|
%lead {
|
111
|
-
font-size: $paragraph-font-size +
|
112
|
+
font-size: $paragraph-font-size + em-calc(3.5);
|
112
113
|
line-height: 1.6;
|
113
114
|
}
|
114
115
|
|
@@ -186,7 +187,7 @@ $microformat-abbr-font-decoration: none !default;
|
|
186
187
|
text-rendering: $header-text-rendering;
|
187
188
|
margin-top: $header-top-margin;
|
188
189
|
margin-bottom: $header-bottom-margin;
|
189
|
-
line-height: $header-line-height -
|
190
|
+
line-height: $header-line-height - em-calc(3);
|
190
191
|
|
191
192
|
small {
|
192
193
|
font-size: $small-font-size;
|
@@ -195,10 +196,10 @@ $microformat-abbr-font-decoration: none !default;
|
|
195
196
|
}
|
196
197
|
}
|
197
198
|
|
198
|
-
h1 { font-size: $h1-font-size -
|
199
|
-
h2 { font-size: $h2-font-size -
|
200
|
-
h3 { font-size: $h3-font-size -
|
201
|
-
h4 { font-size: $h4-font-size -
|
199
|
+
h1 { font-size: $h1-font-size - em-calc(10); }
|
200
|
+
h2 { font-size: $h2-font-size - em-calc(10); }
|
201
|
+
h3 { font-size: $h3-font-size - em-calc(5); }
|
202
|
+
h4 { font-size: $h4-font-size - em-calc(5); }
|
202
203
|
h5 { font-size: $h5-font-size; }
|
203
204
|
h6 { font-size: $h6-font-size; }
|
204
205
|
|
@@ -208,7 +209,7 @@ $microformat-abbr-font-decoration: none !default;
|
|
208
209
|
border: $hr-border-style $hr-border-color;
|
209
210
|
border-width: $hr-border-width 0 0;
|
210
211
|
clear: both;
|
211
|
-
margin: $hr-margin 0 ($hr-margin -
|
212
|
+
margin: $hr-margin 0 ($hr-margin - em-calc(1));
|
212
213
|
height: 0;
|
213
214
|
}
|
214
215
|
|
@@ -249,6 +250,7 @@ $microformat-abbr-font-decoration: none !default;
|
|
249
250
|
|
250
251
|
ul, ol {
|
251
252
|
margin-#{$default-float}: $list-side-margin;
|
253
|
+
&.no-bullet { margin-#{$default-float}: $list-side-margin-no-bullet; }
|
252
254
|
}
|
253
255
|
|
254
256
|
/* Unordered Lists */
|