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
data/docs/css/_footer.scss
CHANGED
@@ -229,7 +229,7 @@
|
|
229
229
|
|
230
230
|
@media only screen and (min-width: 768px) and (max-width: 1024px) and (orientation: portrait) {
|
231
231
|
.zurb-footer-top .property {
|
232
|
-
padding-top:
|
232
|
+
padding-top: 0;
|
233
233
|
}
|
234
234
|
.zurb-footer-top .property .learn-links, .zurb-footer-top .property .support-links, .zurb-footer-top .property .connect-links {
|
235
235
|
height: 240px;
|
@@ -238,10 +238,10 @@
|
|
238
238
|
}
|
239
239
|
@media only screen and (max-width: 767px) {
|
240
240
|
.zurb-footer-top .property .property-info {
|
241
|
-
padding-top:
|
241
|
+
padding-top: 0;
|
242
242
|
}
|
243
|
-
|
244
|
-
|
243
|
+
|
244
|
+
|
245
245
|
.zurb-footer-top .property .learn-links, .zurb-footer-top .property .support-links, .zurb-footer-top .property .connect-links {
|
246
246
|
border: none;
|
247
247
|
height: auto;
|
@@ -312,7 +312,7 @@
|
|
312
312
|
.zurb-footer-bottom p.copyright {
|
313
313
|
margin-bottom: 20px !important;
|
314
314
|
}
|
315
|
-
|
315
|
+
|
316
316
|
.zurb-footer-top .property h3 a {
|
317
317
|
font-size: 23px !important;
|
318
318
|
}
|
@@ -329,7 +329,7 @@
|
|
329
329
|
clear: both;
|
330
330
|
}
|
331
331
|
.zurb-footer-top .global .footer-link-block span {
|
332
|
-
padding-left:
|
332
|
+
padding-left: 0;
|
333
333
|
}
|
334
334
|
.zurb-footer-top .global .footer-link-block.services {
|
335
335
|
border-top: 0;
|
@@ -368,7 +368,7 @@
|
|
368
368
|
clear: both;
|
369
369
|
}
|
370
370
|
.zurb-footer-top .global .footer-link-block span {
|
371
|
-
padding-left:
|
371
|
+
padding-left: 0;
|
372
372
|
}
|
373
373
|
.zurb-footer-top .global .footer-link-block.services {
|
374
374
|
border-top: 0;
|
data/docs/css/_offcanvas.scss
CHANGED
@@ -7,20 +7,20 @@ canvas { background: #23B9D2; }
|
|
7
7
|
#sidebar .paneled .container { overflow: hidden; }
|
8
8
|
|
9
9
|
/* ==============================
|
10
|
-
---- Main Nav Styles ----
|
10
|
+
---- Main Nav Styles ----
|
11
11
|
=================================*/
|
12
12
|
|
13
13
|
a.sidebar-button { margin-left: 15px; display: inline-block;}
|
14
14
|
a.sidebar-button img { margin-top: -6px; width: 23px; }
|
15
15
|
a.sidebar-button h4 { font-size: 22px !important; display: inline !important; margin-left: 10px; line-height: 1; color: #fff; font-weight: bold !important; }
|
16
|
-
#sidebar { position: absolute; background: #333; height: 100%; padding:
|
16
|
+
#sidebar { position: absolute; background: #333; height: 100%; padding: 0; -webkit-box-shadow: inset -2px 0 8px -1px #111111; box-shadow: inset -2px 0 8px -1px #111111; padding-top: 10px; }
|
17
17
|
#sidebar h5 a { font-size: 20px !important; }
|
18
18
|
#sidebar hr { margin: 8px 0 20px 0; border-color: #444444 !important;}
|
19
|
-
#sidebar h6,#sidebar h5 { color:#727272; text-transform: uppercase; margin-bottom:
|
19
|
+
#sidebar h6,#sidebar h5 { color:#727272; text-transform: uppercase; margin-bottom: 0; font-family:'Proxima Nova Condensed', 'proxima-nova-condensed', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
|
20
20
|
#sidebar h6 { font-size: 14px; font-weight: bold;}
|
21
|
-
#sidebar .nav-bar { background: none; margin-bottom:
|
21
|
+
#sidebar .nav-bar { background: none; margin-bottom: 0;}
|
22
22
|
#sidebar .nav-bar li { width: 100%; box-shadow: none !important; }
|
23
|
-
#sidebar .nav-bar li a { font-size: 20px !important; font-weight: 500; color: #ccc; font-family: 'Proxima Nova','ProximaNova', 'proxima-nova'; font-weight: 600; padding:
|
23
|
+
#sidebar .nav-bar li a { font-size: 20px !important; font-weight: 500; color: #ccc; font-family: 'Proxima Nova','ProximaNova', 'proxima-nova'; font-weight: 600; padding: 0 !important;}
|
24
24
|
.nav-bar { height:110px; background: #4d4d4d; margin-left: 0; margin-top: 8px !important; }
|
25
25
|
.nav-bar.goodness { height:120px; background: #4d4d4d; margin-left: 0; margin-top: 20px; padding: 0; }
|
26
26
|
.nav-bar > li { float: left; display: block; position: relative; padding: 0; margin: 0; border: 1px solid #333333; border-right: none; line-height: 38px; }
|
@@ -29,11 +29,11 @@ a.sidebar-button h4 { font-size: 22px !important; display: inline !important; ma
|
|
29
29
|
.nav-bar > li ul { margin-bottom: 0; }
|
30
30
|
.nav-bar > li .flyout { display: none; }
|
31
31
|
#sidebar .main-menu { overflow-x: hidden; }
|
32
|
-
#sidebar .main-menu, #sidebar .more-goodness, #sidebar .zurb-links { padding:
|
32
|
+
#sidebar .main-menu, #sidebar .more-goodness, #sidebar .zurb-links { padding: 0 15px; }
|
33
33
|
|
34
34
|
|
35
35
|
/* ==============================
|
36
|
-
ZURB Passport Section
|
36
|
+
ZURB Passport Section
|
37
37
|
============================== */
|
38
38
|
|
39
39
|
#sidebar #passport { display: inline-block; width: 100%; border-bottom: #444444 1px solid; margin-bottom: 10px; }
|
@@ -44,16 +44,16 @@ a.sidebar-button h4 { font-size: 22px !important; display: inline !important; ma
|
|
44
44
|
#sidebar #passport .avatar { height: 70px; float: right; width: 70px; }
|
45
45
|
|
46
46
|
/* ==============================
|
47
|
-
---- ZURB Pillars ----
|
47
|
+
---- ZURB Pillars ----
|
48
48
|
=================================*/
|
49
49
|
|
50
50
|
#sidebar .zurb-links { padding-bottom: 25px; margin-top: -5px; }
|
51
|
-
#sidebar .zurb-links ul.top li { display: inline-block; margin-left:
|
52
|
-
#sidebar .zurb-links ul.top li.logo { margin-left:
|
53
|
-
#sidebar .zurb-links ul.top li.logo a { padding: 3px 8px 3px
|
51
|
+
#sidebar .zurb-links ul.top li { display: inline-block; margin-left: 0; line-height: 1;font-family:'Proxima Nova Condensed', 'proxima-nova-condensed', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
|
52
|
+
#sidebar .zurb-links ul.top li.logo { margin-left: 0; }
|
53
|
+
#sidebar .zurb-links ul.top li.logo a { padding: 3px 8px 3px 0; font-size: 0.9em;}
|
54
54
|
#sidebar .zurb-links ul.top li.logo img { width:60px; margin-top: -4px; }
|
55
55
|
#sidebar .zurb-links ul.top li a { color: #727272; text-transform: uppercase; font-size: 13px; padding: 5px; font-weight: 600;}
|
56
|
-
#sidebar .zurb-links ul.pillars { list-style: none; }
|
56
|
+
#sidebar .zurb-links ul.pillars { list-style: none; }
|
57
57
|
#sidebar .zurb-links .footer-link-block span.title { padding-bottom:0px;padding-left: 40px; font-family: "ProximaNova" , "Proxima Nova","proxima-nova","Helvetica Neue",Helvetica,Arial,sans-serif; font-size: 1.3em; margin-bottom: 8px; color: #cccccc;}
|
58
58
|
#sidebar .zurb-links .footer-link-block span { display: block; color: #ccc; font-size: 1.0em;line-height: 18px; margin-bottom: 18px; line-height: 20px; margin-bottom: 24px; color: #727272; padding-left: 0; font-size: 0.9em; }
|
59
59
|
#sidebar .zurb-links .footer-link-block { font-weight: normal; background: url("offcanvas/footer-icons.png") no-repeat 0 0; display: block; margin-bottom: 14px; padding-top: 6px; }
|
@@ -103,15 +103,15 @@ a.sidebar-button h4 { font-size: 22px !important; display: inline !important; ma
|
|
103
103
|
.page-panel { display: block; min-height: 800px; float: none; margin: 0; width: 100%; background: #f4f4f4; }
|
104
104
|
.hide-extras .main { width: 100%; }
|
105
105
|
.hide-extras .complementary { display: none; }
|
106
|
-
.navigation#topMenu { display: none; }
|
106
|
+
.navigation#topMenu { display: none; }
|
107
107
|
.active .main { margin-right: 0%; }
|
108
108
|
}
|
109
109
|
|
110
110
|
|
111
111
|
/* ------------------------------------------------------------
|
112
|
-
Disables Overflow on mobile - Had issues with Foundation 4
|
112
|
+
Disables Overflow on mobile - Had issues with Foundation 4
|
113
113
|
------------------------------------------------------------ */
|
114
|
-
@media all and (max-width: 767px) {
|
114
|
+
@media all and (max-width: 767px) {
|
115
115
|
html { overflow-x: hidden; }
|
116
116
|
body.off-canvas { padding: 0; margin: 0; overflow-x: hidden; }
|
117
117
|
}
|
@@ -137,4 +137,4 @@ a.sidebar-button h4 { font-size: 22px !important; display: inline !important; ma
|
|
137
137
|
url("fonts/ProximaNova-Reg-webfont.svg#webfontZam02nTh") format('svg');
|
138
138
|
font-weight: normal;
|
139
139
|
font-style: normal;
|
140
|
-
}
|
140
|
+
}
|
data/docs/css/docs.scss
CHANGED
@@ -4,8 +4,6 @@
|
|
4
4
|
@import "footer";
|
5
5
|
@import "offcanvas";
|
6
6
|
|
7
|
-
ol, li {list-style:none;}
|
8
|
-
|
9
7
|
#changelog {
|
10
8
|
ol, li {list-style: disc; margin-left: 30px;}
|
11
9
|
}
|
@@ -23,7 +21,7 @@ ol, li {list-style:none;}
|
|
23
21
|
}
|
24
22
|
|
25
23
|
.highlight pre {
|
26
|
-
margin:
|
24
|
+
margin: 0;
|
27
25
|
font-size: .7em;
|
28
26
|
line-height: 1.4em;
|
29
27
|
white-space: pre-wrap;
|
data/docs/index.html.erb
CHANGED
@@ -32,19 +32,19 @@
|
|
32
32
|
<div class="row">
|
33
33
|
<div class="large-4 columns">
|
34
34
|
<dl>
|
35
|
-
<dt><
|
35
|
+
<dt><a href="components/grid.html">The Grid</a></dt>
|
36
36
|
<dd>Our grid works on almost any device and has support for nesting, source ordering, offsets and device presentation. It almost makes creating layouts too easy!</dd>
|
37
37
|
</dl>
|
38
38
|
</div>
|
39
39
|
<div class="large-4 columns">
|
40
40
|
<dl>
|
41
|
-
<dt><
|
41
|
+
<dt><a href="components/type.html">Typography</a></dt>
|
42
42
|
<dd>Our type is based on a golden ratio modular scale that creates meaningful relationships for the copy on the page. It's easily updated using Scss or our CSS customizer.</dd>
|
43
43
|
</dl>
|
44
44
|
</div>
|
45
45
|
<div class="large-4 columns">
|
46
46
|
<dl>
|
47
|
-
<dt><
|
47
|
+
<dt><a href="components/buttons.html">Buttons</a></dt>
|
48
48
|
<dd>Buttons are a core interactive element of the Web. We've included styles for creating simple marketing CTAs to complex application toolbars.</dd>
|
49
49
|
</dl>
|
50
50
|
</div>
|
@@ -53,19 +53,19 @@
|
|
53
53
|
<div class="row">
|
54
54
|
<div class="large-4 columns">
|
55
55
|
<dl>
|
56
|
-
<dt><
|
56
|
+
<dt><a href="components/top-bar.html">Navigation</a></dt>
|
57
57
|
<dd>People have to get around. Navigation styles in Foundation include a complex top bar that supports 3-level dropdown navigation for simple bars, sidebars and subnav pills.</dd>
|
58
58
|
</dl>
|
59
59
|
</div>
|
60
60
|
<div class="large-4 columns">
|
61
61
|
<dl>
|
62
|
-
<dt><
|
62
|
+
<dt><a href="components/forms.html">Forms</a></dt>
|
63
63
|
<dd>Built with the Foundation Grid, you can create simple or complicated forms quickly and easily— validation states, custom select, radio buttons and more.</dd>
|
64
64
|
</dl>
|
65
65
|
</div>
|
66
66
|
<div class="large-4 columns">
|
67
67
|
<dl>
|
68
|
-
<dt><
|
68
|
+
<dt><a href="components/panels.html">UI Elements</a></dt>
|
69
69
|
<dd>We've also included lots of useful elements like visibility classes (to hide or show things based on screen size or orientation), labels, alerts, tooltips, panels and a lot more.</dd>
|
70
70
|
</dl>
|
71
71
|
</div>
|
@@ -74,19 +74,19 @@
|
|
74
74
|
<div class="row">
|
75
75
|
<div class="large-4 columns">
|
76
76
|
<dl>
|
77
|
-
<dt><
|
77
|
+
<dt><a href="components/section.html">Section</a></dt>
|
78
78
|
<dd>Whether it's entire pages or simple tabbed content, Foundation's tabs get the job done. Not only stylish, but interactive out of the box.</dd>
|
79
79
|
</dl>
|
80
80
|
</div>
|
81
81
|
<div class="large-4 columns">
|
82
82
|
<dl>
|
83
|
-
<dt><
|
83
|
+
<dt><a href="components/orbit.html">Orbit</a></dt>
|
84
84
|
<dd>A powerful image or content slider that works responsively and includes tons of useful options, such as timers, paddles, bullet thumbs and more.</dd>
|
85
85
|
</dl>
|
86
86
|
</div>
|
87
87
|
<div class="large-4 columns">
|
88
88
|
<dl>
|
89
|
-
<dt><
|
89
|
+
<dt><a href="components/reveal.html">Reveal</a></dt>
|
90
90
|
<dd>You can easily call modals without writing any JS, even spawn subsequent modals cleanly on the same page. Reveal works across devices.</dd>
|
91
91
|
</dl>
|
92
92
|
</div>
|
@@ -95,19 +95,19 @@
|
|
95
95
|
<div class="row">
|
96
96
|
<div class="large-4 columns">
|
97
97
|
<dl>
|
98
|
-
<dt><
|
98
|
+
<dt><a href="components/clearing.html">Clearing</a></dt>
|
99
99
|
<dd>Show off your images in style with our easy to use gallery plugin. It's built with simple unordered lists that can be styled to your hearts content.</dd>
|
100
100
|
</dl>
|
101
101
|
</div>
|
102
102
|
<div class="large-4 columns">
|
103
103
|
<dl>
|
104
|
-
<dt><
|
104
|
+
<dt><a href="components/magellan.html">Magellan</a></dt>
|
105
105
|
<dd>A flexible sticky navigation that knows where you are on the page. You just tell it what to recognize and set it off.</dd>
|
106
106
|
</dl>
|
107
107
|
</div>
|
108
108
|
<div class="large-4 columns">
|
109
109
|
<dl>
|
110
|
-
<dt><
|
110
|
+
<dt><a href="components/joyride.html">Joyride</a></dt>
|
111
111
|
<dd>This plugin lets you give users a tour of your site or app. Joyride is easy to customize using CSS or our Scss variables.</dd>
|
112
112
|
</dl>
|
113
113
|
</div>
|
@@ -116,20 +116,20 @@
|
|
116
116
|
<div class="row">
|
117
117
|
<div class="large-4 columns">
|
118
118
|
<dl>
|
119
|
-
<dt><
|
119
|
+
<dt><a href="components/tooltips.html">Tooltips</a></dt>
|
120
120
|
<dd>Tooltips lets you add quick hover or tap tooltips to elements.</dd>
|
121
121
|
</dl>
|
122
122
|
</div>
|
123
123
|
<div class="large-4 columns end">
|
124
124
|
<dl>
|
125
|
-
<dt><
|
125
|
+
<dt><a href="components/dropdown.html">Dropdown</a></dt>
|
126
126
|
<dd>We've made a dropdown plugin that makes it easy to attach a popover dropdown to any element on the page.</dd>
|
127
127
|
</dl>
|
128
128
|
</div>
|
129
129
|
<div class="large-4 columns end">
|
130
130
|
<dl>
|
131
|
-
<dt><
|
132
|
-
<dd>This plugin
|
131
|
+
<dt><a href="components/interchange.html">Interchange</a></dt>
|
132
|
+
<dd>This plugin lets you load up the appropriate size image based on media queries that you define.</dd>
|
133
133
|
</dl>
|
134
134
|
</div>
|
135
135
|
</div>
|
@@ -137,7 +137,7 @@
|
|
137
137
|
<div class="row">
|
138
138
|
<div class="large-4 columns">
|
139
139
|
<dl>
|
140
|
-
<dt><
|
140
|
+
<dt><a href="components/abide.html">Abide</a></dt>
|
141
141
|
<dd>Abide is an HTML5 form validation library that supports the native API by using patterns and required attributes.</dd>
|
142
142
|
</dl>
|
143
143
|
</div>
|
@@ -151,19 +151,19 @@
|
|
151
151
|
<div class="row">
|
152
152
|
<div class="large-4 columns">
|
153
153
|
<dl>
|
154
|
-
<dt
|
154
|
+
<dt>css</dt>
|
155
155
|
<dd>Includes <code>foundation.css</code> and <code>foundation.min.css</code> so you can choose which to use. You'll also see <code>normalize.css</code>, which we use for resets. Add another stylesheet on top of Foundation to override defaults.</dd>
|
156
156
|
</dl>
|
157
157
|
</div>
|
158
158
|
<div class="large-4 columns">
|
159
159
|
<dl>
|
160
|
-
<dt
|
160
|
+
<dt>js</dt>
|
161
161
|
<dd>All of our plugins and the necessary JavaScript to make Foundation work properly. <strong>All JS is initiated by default</strong>.</dd>
|
162
162
|
</dl>
|
163
163
|
</div>
|
164
164
|
<div class="large-4 columns">
|
165
165
|
<dl>
|
166
|
-
<dt
|
166
|
+
<dt>img</dt>
|
167
167
|
<dd>This directory actually comes empty in Foundation 4! We no longer have any images included in the core of Foundation.</dd>
|
168
168
|
</dl>
|
169
169
|
</div>
|
@@ -172,19 +172,19 @@
|
|
172
172
|
<div class="row">
|
173
173
|
<div class="large-4 columns">
|
174
174
|
<dl>
|
175
|
-
<dt
|
175
|
+
<dt>index.html</dt>
|
176
176
|
<dd>A sample structure for page content, giving you something to use as a basic structural template for the rest of the pages in your project.</dd>
|
177
177
|
</dl>
|
178
178
|
</div>
|
179
179
|
<div class="large-4 columns">
|
180
180
|
<dl>
|
181
|
-
<dt
|
181
|
+
<dt>humans.txt</dt>
|
182
182
|
<dd>A way to tell the world about the people that worked on the sites you build, giving them kudos they deserve.</dd>
|
183
183
|
</dl>
|
184
184
|
</div>
|
185
185
|
<div class="large-4 columns">
|
186
186
|
<dl>
|
187
|
-
<dt
|
187
|
+
<dt>robots.txt</dt>
|
188
188
|
<dd>Give instructions to web robots so search engines know what to do when they crawl your site for content.</dd>
|
189
189
|
</dl>
|
190
190
|
</div>
|
@@ -197,7 +197,7 @@
|
|
197
197
|
<dl>
|
198
198
|
<dt>scss/</dt>
|
199
199
|
<dd>Your main style folder is named <strong>scss/</strong> and contains <code>app.scss</code> (which has the foundation gem import and commented portions you can pick and choose). Override the Foundation styles within your <code>app.scss</code> file. You can see the compiled CSS in your stylesheets directory after you manually <span class="has-tip top" title="$ compass compile <filename>">compile</span> or <span class="has-tip top" title="$ compass watch <directory>">watch</span>. This directory also includes <code>_settings.scss</code>, which is used to control variables that help easily style Foundation. You'll also notice that the directory names are slightly different. Compass defaults to "stylesheets", "javascripts", and "image".</dd>
|
200
|
-
<dt
|
200
|
+
<dt>config.rb</dt>
|
201
201
|
<dd>This file is used by <a href="http://compass-style.org">Compass</a> to compile your project. Here you can control the output style of your CSS, the structure of your directories and other useful settings.</dd>
|
202
202
|
</dl>
|
203
203
|
</div>
|
@@ -264,7 +264,7 @@
|
|
264
264
|
<div class="row">
|
265
265
|
<div class="large-4 columns">
|
266
266
|
<dl>
|
267
|
-
<dt
|
267
|
+
<dt>Doctype & Head</dt>
|
268
268
|
<dd>We use the HTML doctype declaration to tell the browser what to expect. From there we've used a <a href="http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/">technique by Paul Irish</a> that attaches classes to the HTML for IE. After that, we set the character set to UTF-8.</dd>
|
269
269
|
<dt>Meta Viewport tag</dt>
|
270
270
|
<dd>This is used to make sure smaller devices use the device width as the viewport width.</dd>
|
@@ -274,7 +274,7 @@
|
|
274
274
|
</div>
|
275
275
|
<div class="large-4 columns">
|
276
276
|
<dl>
|
277
|
-
<dt
|
277
|
+
<dt>CSS & Modernizr</dt>
|
278
278
|
<dd>The default CSS download includes everything you need to get going, including necessary styles and our custom Modernizr script.</dd>
|
279
279
|
<dt>CSS</dt>
|
280
280
|
<dd>We include <code>foundation.min.css</code> and <code>foundation.css</code> with a default CSS download. The difference here is whether or not you want minified code or not (link whichever you want, but not both).</dd>
|
@@ -284,7 +284,7 @@
|
|
284
284
|
<dl>
|
285
285
|
<dt>Modernizr</dt>
|
286
286
|
<dd>We use this to give us the HTML5 Shiv, touch classes and JS media queries that help us control Foundation.</dd>
|
287
|
-
<dt
|
287
|
+
<dt>Javascripts</dt>
|
288
288
|
<dd>Our JS is linked up right before the closing body tag and includes all necessary plugins and initializers to hit the ground running.</dd>
|
289
289
|
</dl>
|
290
290
|
</div>
|
@@ -295,8 +295,8 @@
|
|
295
295
|
<div class="panel">
|
296
296
|
<h3>Get going!</h3>
|
297
297
|
<h5 class="subheader">Now that you understand the gist of what Foundation is and how it works, it's time to start a project! We've got two different ways for you to build projects with Foundation, a Compass Gem using Scss or a with plain CSS.</h5>
|
298
|
-
<a href="./sass.html" class="button">Using the Gem</a
|
299
|
-
<a href="http://foundation.zurb.com/migration.php" class="button secondary">Quickstart with CSS</a
|
298
|
+
<a href="./sass.html" class="button">Using the Gem</a>
|
299
|
+
<a href="http://foundation.zurb.com/migration.php" class="button secondary">Quickstart with CSS</a>
|
300
300
|
</div>
|
301
301
|
|
302
302
|
|
data/docs/layout.html.erb
CHANGED
@@ -53,7 +53,7 @@
|
|
53
53
|
|
54
54
|
|
55
55
|
<header class="show-for-small">
|
56
|
-
<a class='sidebar-button show-for-small' id="sidebarButton" href="#sidebar" ><img src="<%= asset_path %>/offcanvas/menu-wht.png"><h4>Foundation</h4></a>
|
56
|
+
<a class='sidebar-button show-for-small' id="sidebarButton" href="#sidebar" ><img src="<%= asset_path %>/offcanvas/menu-wht.png" alt="ZURB Menu"><h4>Foundation</h4></a>
|
57
57
|
</header>
|
58
58
|
|
59
59
|
<% @page_title = "4 Documentation" %>
|
@@ -159,7 +159,7 @@
|
|
159
159
|
</section>
|
160
160
|
|
161
161
|
|
162
|
-
<
|
162
|
+
<aside id="sidebar" role="complementary">
|
163
163
|
|
164
164
|
<!-- For Future Use
|
165
165
|
<div id="passport">
|
@@ -206,7 +206,7 @@
|
|
206
206
|
<div class="more-goodness">
|
207
207
|
<h6>More ZURB Goodness</h6>
|
208
208
|
<nav role="navigation">
|
209
|
-
<ul id="
|
209
|
+
<ul id="secondarySideMainNav" class="nav-bar goodness">
|
210
210
|
<li><a href="http://zurb.com/expo/foundation-intro">Foundation Training</a></li>
|
211
211
|
<li><a href="http://zurb.com/services/our-work">Our Work</a></li>
|
212
212
|
<li><a href="http://zurb.com/apps">ZURB Apps</a></li>
|
@@ -219,7 +219,7 @@
|
|
219
219
|
<!-- These links will be the same across all of our proprties & apps -->
|
220
220
|
<div class="zurb-links">
|
221
221
|
<ul class="top">
|
222
|
-
<li class="logo"><a href="http://zurb.com"><img src="<%= asset_path %>/offcanvas/zurb-logo.png"></a></li>
|
222
|
+
<li class="logo"><a href="http://zurb.com"><img src="<%= asset_path %>/offcanvas/zurb-logo.png" alt="ZURB"></a></li>
|
223
223
|
<li><a href="http://zurb.com/about">About</a></li>
|
224
224
|
<li><a href="http://zurb.com/blog">Blog</a></li>
|
225
225
|
<li><a href="http://zurb.com/contact">Contact</a></li>
|
@@ -252,7 +252,7 @@
|
|
252
252
|
</ul>
|
253
253
|
</div>
|
254
254
|
|
255
|
-
</
|
255
|
+
</aside>
|
256
256
|
|
257
257
|
<!-- Reveal Modals begin -->
|
258
258
|
<div id="firstModal" class="reveal-modal">
|
data/docs/media-queries.html.erb
CHANGED
@@ -42,9 +42,9 @@
|
|
42
42
|
|
43
43
|
<%= code_example '
|
44
44
|
/* Available Variables */
|
45
|
-
$small-screen:
|
46
|
-
$medium-screen:
|
47
|
-
$large-screen:
|
45
|
+
$small-screen: em-calc(768);
|
46
|
+
$medium-screen: em-calc(1280);
|
47
|
+
$large-screen: em-calc(1440);
|
48
48
|
|
49
49
|
$screen: "only screen";
|
50
50
|
$small: "only screen and (min-width:"#{$small-screen}")";
|
data/docs/rails.html.erb
CHANGED
@@ -46,7 +46,8 @@ end
|
|
46
46
|
<p>If you're planning on using <a href="http://sass-lang.com/" rel="nofollow">Sass</a> then you'll want to rename <code>application.css</code> to <code>application.scss</code>. That file should then look like:</p>
|
47
47
|
|
48
48
|
<%= code_example '
|
49
|
-
@import "
|
49
|
+
@import "foundation_and_overrides";
|
50
|
+
/* Add imports of custom sass/scss files here */
|
50
51
|
', :css %>
|
51
52
|
|
52
53
|
<h5 class="subheader">Add Foundation to your JS</h5>
|
data/docs/sass.html.erb
CHANGED
@@ -133,6 +133,7 @@
|
|
133
133
|
<h5>Adding Foundation to existing Compass projects</h5>
|
134
134
|
<p>If you've created a project using Compass, but didn't require the Foundation gem, you'll need to install it separately. When you do this you'll get all the necessary files on top of the ones you already have. If something is a duplicate, Compass will ignore it. The steps you'll take to properly install Foundation are:</p>
|
135
135
|
<ol style="margin-left: 20px;">
|
136
|
+
<li>run <span class="keystroke">gem install zurb-foundation</span></li>
|
136
137
|
<li>Add <span class="keystroke">require "zurb-foundation"</span> to your config.rb file</li>
|
137
138
|
<li><span class="keystroke">cd path/to/your-project</span></li>
|
138
139
|
<li>run <span class="keystroke">compass install foundation</span></li>
|
@@ -247,11 +248,51 @@ $base-line-height: 150%;
|
|
247
248
|
/* set the value of $em-base to $base-font-size ($em-base: $base-font-size;) */
|
248
249
|
$em-base: 16px !default;
|
249
250
|
|
250
|
-
/*
|
251
|
-
@function
|
252
|
-
@return $
|
251
|
+
/* It strips the unit of measure and returns it */
|
252
|
+
@function strip-unit($num) {
|
253
|
+
@return $num / ($num * 0 + 1);
|
253
254
|
}
|
254
255
|
|
256
|
+
/* New Syntax, allows to optionally calculate on a different base value to counter compounding effect of em\'s. */
|
257
|
+
/* Call with 1, 2, 3 or 4 parameters, \'px\' is not required but supported */
|
258
|
+
/* em-calc(10 20 30px 40); */
|
259
|
+
/* Space delimited, if you want to delimit using comma\'s, wrap it in another pair of brackets */
|
260
|
+
/* em-calc((10, 20, 30, 40px)); */
|
261
|
+
/* Optionally call with a different base (eg: 8px) to calculate em. */
|
262
|
+
/* em-calc(16px 32px 48px, 8px); */
|
263
|
+
/* If you require to comma separate your list */
|
264
|
+
/* em-calc((16px, 32px, 48), 8px); */
|
265
|
+
|
266
|
+
@function convert-to-em($value, $base-value: $em-base) {
|
267
|
+
$value: strip-unit($value) / strip-unit($base-value) * 1em;
|
268
|
+
@if ($value == 0em) { $value: 0; } /* Turn 0em into 0 */
|
269
|
+
@return $value;
|
270
|
+
}
|
271
|
+
|
272
|
+
@function em-calc($values, $base-value: $em-base) {
|
273
|
+
$max: length($values);
|
274
|
+
|
275
|
+
@if $max == 1 { @return convert-to-em(nth($values, 1), $base-value); }
|
276
|
+
|
277
|
+
$emValues: ();
|
278
|
+
@for $i from 1 through $max {
|
279
|
+
$emValues: append($emValues, convert-to-em(nth($values, $i), $base-value));
|
280
|
+
}
|
281
|
+
@return $emValues;
|
282
|
+
}
|
283
|
+
|
284
|
+
/* Support for the old syntax */
|
285
|
+
|
286
|
+
@function emCalc($values){
|
287
|
+
@return em-calc($values);
|
288
|
+
}
|
289
|
+
|
290
|
+
/* Maybe you want to create rems with pixels */
|
291
|
+
/* $rem-base: 0.625 !default; /*Set the value corresponding to body font size. In this case, you should set as: body {font-size: 62.5%;} */
|
292
|
+
/* @function remCalc($pxWidth) { */
|
293
|
+
/* @return $pxWidth / $rem-base * 1rem; */
|
294
|
+
/* }
|
295
|
+
|
255
296
|
/* Change whether or not you include browser prefixes */
|
256
297
|
$experimental: true !default;
|
257
298
|
|
@@ -344,8 +385,8 @@ $cursor-help-value: "help";
|
|
344
385
|
/* Grid Variables */
|
345
386
|
|
346
387
|
|
347
|
-
$row-width:
|
348
|
-
$column-gutter:
|
388
|
+
$row-width: em-calc(1000);
|
389
|
+
$column-gutter: em-calc(30);
|
349
390
|
$total-columns: 12;
|
350
391
|
|
351
392
|
|
@@ -355,7 +396,7 @@ $total-columns: 12;
|
|
355
396
|
/* Maximum number of block grid elements per row */
|
356
397
|
|
357
398
|
$block-grid-elements: 12;
|
358
|
-
$block-grid-default-spacing:
|
399
|
+
$block-grid-default-spacing: em-calc(20);
|
359
400
|
|
360
401
|
/* Enables media queries for block-grid classes. Set to false if writing semantic HTML. */
|
361
402
|
|
@@ -378,11 +419,11 @@ $header-text-rendering: optimizeLegibility;
|
|
378
419
|
|
379
420
|
/* Heading font sizes */
|
380
421
|
|
381
|
-
$h1-font-size:
|
382
|
-
$h2-font-size:
|
383
|
-
$h3-font-size:
|
384
|
-
$h4-font-size:
|
385
|
-
$h5-font-size:
|
422
|
+
$h1-font-size: em-calc(44);
|
423
|
+
$h2-font-size: em-calc(37);
|
424
|
+
$h3-font-size: em-calc(27);
|
425
|
+
$h4-font-size: em-calc(23);
|
426
|
+
$h5-font-size: em-calc(18);
|
386
427
|
$h6-font-size: 1em;
|
387
428
|
|
388
429
|
/* Subheaders */
|
@@ -404,8 +445,8 @@ $paragraph-font-family: inherit;
|
|
404
445
|
$paragraph-font-weight: normal;
|
405
446
|
$paragraph-font-size: 1em;
|
406
447
|
$paragraph-line-height: 1.6;
|
407
|
-
$paragraph-margin-bottom:
|
408
|
-
$paragraph-aside-font-size:
|
448
|
+
$paragraph-margin-bottom: em-calc(20);
|
449
|
+
$paragraph-aside-font-size: em-calc(14);
|
409
450
|
$paragraph-aside-line-height: 1.35;
|
410
451
|
$paragraph-aside-font-style: italic;
|
411
452
|
|
@@ -426,23 +467,23 @@ $anchor-font-color-hover: darken($primary-color, 5%);
|
|
426
467
|
$hr-border-width: 1px;
|
427
468
|
$hr-border-style: solid;
|
428
469
|
$hr-border-color: #ddd;
|
429
|
-
$hr-margin:
|
470
|
+
$hr-margin: em-calc(20);
|
430
471
|
|
431
472
|
/* Lists */
|
432
473
|
|
433
474
|
$list-style-position: outside;
|
434
|
-
$list-side-margin:
|
435
|
-
$list-nested-margin:
|
475
|
+
$list-side-margin: 0;
|
476
|
+
$list-nested-margin: em-calc(20);
|
436
477
|
$definition-list-header-weight: bold;
|
437
478
|
$definition-list-header-margin-bottom: .3em;
|
438
|
-
$definition-list-margin-bottom:
|
479
|
+
$definition-list-margin-bottom: em-calc(12);
|
439
480
|
|
440
481
|
/* Blockquotes */
|
441
482
|
|
442
483
|
$blockquote-font-color: lighten($header-font-color, 30%);
|
443
|
-
$blockquote-padding:
|
484
|
+
$blockquote-padding: em-calc(9, 20, 0, 19);
|
444
485
|
$blockquote-border: 1px solid #ddd;
|
445
|
-
$blockquote-cite-font-size:
|
486
|
+
$blockquote-cite-font-size: em-calc(13);
|
446
487
|
$blockquote-cite-font-color: lighten($header-font-color, 20%);
|
447
488
|
$blockquote-cite-link-color: $blockquote-cite-font-color;
|
448
489
|
|
@@ -452,8 +493,8 @@ $acronym-underline: 1px dotted #ddd;
|
|
452
493
|
|
453
494
|
/* Padding and margin */
|
454
495
|
|
455
|
-
$microformat-padding:
|
456
|
-
$microformat-margin:
|
496
|
+
$microformat-padding: em-calc(10, 12);
|
497
|
+
$microformat-margin: em-calc(0, 0, 20, 0);
|
457
498
|
|
458
499
|
/* Border styles */
|
459
500
|
|
@@ -464,7 +505,7 @@ $microformat-border-color: #ddd;
|
|
464
505
|
/* Full name font styles */
|
465
506
|
|
466
507
|
$microformat-fullname-font-weight: bold;
|
467
|
-
$microformat-fullname-font-size:
|
508
|
+
$microformat-fullname-font-size: em-calc(15);
|
468
509
|
|
469
510
|
/* Summary font styles */
|
470
511
|
|
@@ -472,7 +513,7 @@ $microformat-summary-font-weight: bold;
|
|
472
513
|
|
473
514
|
/* <abbr> padding */
|
474
515
|
|
475
|
-
$microformat-abbr-padding:
|
516
|
+
$microformat-abbr-padding: em-calc(0, 1);
|
476
517
|
|
477
518
|
/* <abbr> font styles */
|
478
519
|
|
@@ -485,18 +526,18 @@ $microformat-abbr-font-decoration: none;
|
|
485
526
|
|
486
527
|
/* Base for lots of form spacing and positioning styles */
|
487
528
|
|
488
|
-
$form-spacing:
|
529
|
+
$form-spacing: em-calc(16);
|
489
530
|
|
490
531
|
/* Labels */
|
491
532
|
|
492
533
|
$form-label-pointer: pointer;
|
493
|
-
$form-label-font-size:
|
534
|
+
$form-label-font-size: em-calc(14);
|
494
535
|
$form-label-font-weight: 500;
|
495
536
|
$form-label-font-color: lighten(#000, 30%);
|
496
|
-
$form-label-bottom-margin:
|
537
|
+
$form-label-bottom-margin: em-calc(3);
|
497
538
|
$input-font-family: inherit;
|
498
539
|
$input-font-color: rgba(0,0,0,0.75);
|
499
|
-
$input-font-size:
|
540
|
+
$input-font-size: em-calc(14);
|
500
541
|
$input-bg-color: #fff;
|
501
542
|
$input-focus-bg-color: darken(#fff, 2%);
|
502
543
|
$input-border-color: darken(#fff, 20%);
|
@@ -512,14 +553,14 @@ $input-include-glowing-effect: true;
|
|
512
553
|
$fieldset-border-style: solid;
|
513
554
|
$fieldset-border-width: 1px;
|
514
555
|
$fieldset-border-color: #ddd;
|
515
|
-
$fieldset-padding:
|
516
|
-
$fieldset-margin:
|
556
|
+
$fieldset-padding: em-calc(20);
|
557
|
+
$fieldset-margin: em-calc(18, 0);
|
517
558
|
|
518
559
|
/* Legends */
|
519
560
|
|
520
561
|
$legend-bg: #fff;
|
521
562
|
$legend-font-weight: bold;
|
522
|
-
$legend-padding:
|
563
|
+
$legend-padding: em-calc(0, 3);
|
523
564
|
|
524
565
|
/* Prefix and postfix input elements */
|
525
566
|
|
@@ -533,9 +574,9 @@ $input-prefix-font-color-alt: #fff;
|
|
533
574
|
|
534
575
|
/* Error states for inputs and labels */
|
535
576
|
|
536
|
-
$input-error-message-padding:
|
537
|
-
$input-error-message-top: -($form-spacing) -
|
538
|
-
$input-error-message-font-size:
|
577
|
+
$input-error-message-padding: em-calc(6, 4);
|
578
|
+
$input-error-message-top: -($form-spacing) - em-calc(5);
|
579
|
+
$input-error-message-font-size: em-calc(12);
|
539
580
|
$input-error-message-font-weight: bold;
|
540
581
|
$input-error-message-font-color: #fff;
|
541
582
|
$input-error-message-font-color-alt: #333;
|
@@ -551,25 +592,25 @@ $glowing-effect-color: $input-focus-border-color;
|
|
551
592
|
|
552
593
|
/* Padding for buttons. */
|
553
594
|
|
554
|
-
$button-tny:
|
555
|
-
$button-sml:
|
556
|
-
$button-med:
|
557
|
-
$button-lrg:
|
595
|
+
$button-tny: em-calc(7);
|
596
|
+
$button-sml: em-calc(9);
|
597
|
+
$button-med: em-calc(12);
|
598
|
+
$button-lrg: em-calc(16);
|
558
599
|
|
559
600
|
/* Display property. */
|
560
601
|
|
561
602
|
$button-display: inline-block;
|
562
|
-
$button-margin-bottom:
|
603
|
+
$button-margin-bottom: em-calc(20);
|
563
604
|
|
564
605
|
/* Button text styles. */
|
565
606
|
|
566
607
|
$button-font-family: inherit;
|
567
608
|
$button-font-color: #fff;
|
568
609
|
$button-font-color-alt: #333;
|
569
|
-
$button-font-med:
|
570
|
-
$button-font-tny:
|
571
|
-
$button-font-sml:
|
572
|
-
$button-font-lrg:
|
610
|
+
$button-font-med: em-calc(16);
|
611
|
+
$button-font-tny: em-calc(11);
|
612
|
+
$button-font-sml: em-calc(13);
|
613
|
+
$button-font-lrg: em-calc(20);
|
573
614
|
$button-font-weight: bold;
|
574
615
|
$button-font-align: center;
|
575
616
|
|
@@ -597,7 +638,7 @@ $button-disabled-opacity: 0.6;
|
|
597
638
|
|
598
639
|
/* Sets the margin for the right side by default, and the left margin if right-to-left direction is used */
|
599
640
|
|
600
|
-
$button-bar-margin-opposite:
|
641
|
+
$button-bar-margin-opposite: em-calc(10);
|
601
642
|
|
602
643
|
|
603
644
|
/* Dropdown Button Variables */
|
@@ -613,28 +654,28 @@ $dropdown-button-pip-color-alt: #333;
|
|
613
654
|
$dropdown-button-padding-tny: $button-tny * 5;
|
614
655
|
$dropdown-button-pip-size-tny: $button-tny;
|
615
656
|
$dropdown-button-pip-right-tny: $button-tny * 2;
|
616
|
-
$dropdown-button-pip-top-tny: -$button-tny / 2 +
|
657
|
+
$dropdown-button-pip-top-tny: -$button-tny / 2 + em-calc(1);
|
617
658
|
|
618
659
|
/* Small dropdown buttons */
|
619
660
|
|
620
661
|
$dropdown-button-padding-sml: $button-sml * 5;
|
621
662
|
$dropdown-button-pip-size-sml: $button-sml;
|
622
663
|
$dropdown-button-pip-right-sml: $button-sml * 2;
|
623
|
-
$dropdown-button-pip-top-sml: -$button-sml / 2 +
|
664
|
+
$dropdown-button-pip-top-sml: -$button-sml / 2 + em-calc(1);
|
624
665
|
|
625
666
|
/* Medium dropdown buttons */
|
626
667
|
|
627
|
-
$dropdown-button-padding-med: $button-med * 4 +
|
628
|
-
$dropdown-button-pip-size-med: $button-med -
|
668
|
+
$dropdown-button-padding-med: $button-med * 4 + em-calc(3);
|
669
|
+
$dropdown-button-pip-size-med: $button-med - em-calc(3);
|
629
670
|
$dropdown-button-pip-right-med: $button-med * 2;
|
630
|
-
$dropdown-button-pip-top-med: -$button-med / 2 +
|
671
|
+
$dropdown-button-pip-top-med: -$button-med / 2 + em-calc(2);
|
631
672
|
|
632
673
|
/* Large dropdown buttons */
|
633
674
|
|
634
675
|
$dropdown-button-padding-lrg: $button-lrg * 4;
|
635
|
-
$dropdown-button-pip-size-lrg: $button-lrg -
|
636
|
-
$dropdown-button-pip-right-lrg: $button-lrg +
|
637
|
-
$dropdown-button-pip-top-lrg: -$button-lrg / 2 +
|
676
|
+
$dropdown-button-pip-size-lrg: $button-lrg - em-calc(6);
|
677
|
+
$dropdown-button-pip-right-lrg: $button-lrg + em-calc(12);
|
678
|
+
$dropdown-button-pip-top-lrg: -$button-lrg / 2 + em-calc(3);
|
638
679
|
|
639
680
|
|
640
681
|
/* Split Button Variables */
|
@@ -653,7 +694,7 @@ $split-button-padding-tny: $button-tny * 9;
|
|
653
694
|
$split-button-span-width-tny: $button-tny * 6.5;
|
654
695
|
$split-button-pip-size-tny: $button-tny;
|
655
696
|
$split-button-pip-top-tny: $button-tny * 2;
|
656
|
-
$split-button-pip-left-tny:
|
697
|
+
$split-button-pip-left-tny: em-calc(-5);
|
657
698
|
|
658
699
|
/* Small split buttons */
|
659
700
|
|
@@ -661,23 +702,23 @@ $split-button-padding-sml: $button-sml * 7;
|
|
661
702
|
$split-button-span-width-sml: $button-sml * 5;
|
662
703
|
$split-button-pip-size-sml: $button-sml;
|
663
704
|
$split-button-pip-top-sml: $button-sml * 1.5;
|
664
|
-
$split-button-pip-left-sml:
|
705
|
+
$split-button-pip-left-sml: em-calc(-9);
|
665
706
|
|
666
707
|
/* Medium split buttons */
|
667
708
|
|
668
709
|
$split-button-padding-med: $button-med * 6.4;
|
669
710
|
$split-button-span-width-med: $button-med * 4;
|
670
|
-
$split-button-pip-size-med: $button-med -
|
711
|
+
$split-button-pip-size-med: $button-med - em-calc(3);
|
671
712
|
$split-button-pip-top-med: $button-med * 1.5;
|
672
|
-
$split-button-pip-left-med:
|
713
|
+
$split-button-pip-left-med: em-calc(-9);
|
673
714
|
|
674
715
|
/* Large split buttons */
|
675
716
|
|
676
717
|
$split-button-padding-lrg: $button-lrg * 6;
|
677
718
|
$split-button-span-width-lrg: $button-lrg * 3.75;
|
678
|
-
$split-button-pip-size-lrg: $button-lrg -
|
679
|
-
$split-button-pip-top-lrg: $button-lrg +
|
680
|
-
$split-button-pip-left-lrg:
|
719
|
+
$split-button-pip-size-lrg: $button-lrg - em-calc(6);
|
720
|
+
$split-button-pip-top-lrg: $button-lrg + em-calc(5);
|
721
|
+
$split-button-pip-left-lrg: em-calc(-9);
|
681
722
|
|
682
723
|
|
683
724
|
/* Alert Variables */
|
@@ -685,15 +726,15 @@ $split-button-pip-left-lrg: emCalc(-9);
|
|
685
726
|
|
686
727
|
/* Alert padding */
|
687
728
|
|
688
|
-
$alert-padding-top:
|
729
|
+
$alert-padding-top: em-calc(11);
|
689
730
|
$alert-padding-default-float: $alert-padding-top;
|
690
|
-
$alert-padding-opposite-direction: $alert-padding-top +
|
691
|
-
$alert-padding-bottom: $alert-padding-top +
|
731
|
+
$alert-padding-opposite-direction: $alert-padding-top + em-calc(10);
|
732
|
+
$alert-padding-bottom: $alert-padding-top + em-calc(1);
|
692
733
|
|
693
734
|
/* Text style */
|
694
735
|
|
695
736
|
$alert-font-weight: bold;
|
696
|
-
$alert-font-size:
|
737
|
+
$alert-font-size: em-calc(14);
|
697
738
|
$alert-font-color: #fff;
|
698
739
|
$alert-font-color-alt: darken($secondary-color, 60%);
|
699
740
|
|
@@ -706,13 +747,13 @@ $alert-function-factor: 10%;
|
|
706
747
|
$alert-border-style: solid;
|
707
748
|
$alert-border-width: 1px;
|
708
749
|
$alert-border-color: darken($primary-color, $alert-function-factor);
|
709
|
-
$alert-bottom-margin:
|
750
|
+
$alert-bottom-margin: em-calc(20);
|
710
751
|
|
711
752
|
/* Close Button style */
|
712
753
|
|
713
754
|
$alert-close-color: #333;
|
714
|
-
$alert-close-position:
|
715
|
-
$alert-close-font-size:
|
755
|
+
$alert-close-position: em-calc(5);
|
756
|
+
$alert-close-font-size: em-calc(22);
|
716
757
|
$alert-close-opacity: 0.3;
|
717
758
|
$alert-close-opacity-hover: 0.5;
|
718
759
|
$alert-close-padding: 5px 4px 4px;
|
@@ -730,8 +771,8 @@ $crumb-bg: lighten($secondary-color, 5%);
|
|
730
771
|
|
731
772
|
/* Padding around the breadcrumbs. */
|
732
773
|
|
733
|
-
$crumb-padding:
|
734
|
-
$crumb-side-padding:
|
774
|
+
$crumb-padding: em-calc(6, 14, 9);
|
775
|
+
$crumb-side-padding: em-calc(12);
|
735
776
|
|
736
777
|
/* Border styles. */
|
737
778
|
|
@@ -743,7 +784,7 @@ $crumb-radius: $global-radius;
|
|
743
784
|
|
744
785
|
/* Various text styles for breadcrumbs. */
|
745
786
|
|
746
|
-
$crumb-font-size:
|
787
|
+
$crumb-font-size: em-calc(11);
|
747
788
|
$crumb-font-color: $primary-color;
|
748
789
|
$crumb-font-color-current: #333;
|
749
790
|
$crumb-font-color-unavailable: #999;
|
@@ -800,7 +841,7 @@ $custom-form-input-size: 16px;
|
|
800
841
|
$custom-form-check-color: #222;
|
801
842
|
$custom-form-check-size: 14px;
|
802
843
|
$custom-form-radio-size: 8px;
|
803
|
-
$custom-form-checkbox-radius:
|
844
|
+
$custom-form-checkbox-radius: 0;
|
804
845
|
|
805
846
|
/* Custom select form element. */
|
806
847
|
|
@@ -809,8 +850,8 @@ $custom-select-fade-to-color: #f3f3f3;
|
|
809
850
|
$custom-select-border-color: #ddd;
|
810
851
|
$custom-select-triangle-color: #aaa;
|
811
852
|
$custom-select-triangle-color-open: #222;
|
812
|
-
$custom-select-height:
|
813
|
-
$custom-select-margin-bottom:
|
853
|
+
$custom-select-height: em-calc(13) + ($form-spacing * 1.5);
|
854
|
+
$custom-select-margin-bottom: em-calc(20);
|
814
855
|
$custom-select-font-color-selected: #141414;
|
815
856
|
$custom-select-disabled-color: #888;
|
816
857
|
|
@@ -822,15 +863,15 @@ $custom-dropdown-border-color: darken(#fff, 20%);
|
|
822
863
|
$custom-dropdown-border-width: 1px;
|
823
864
|
$custom-dropdown-border-style: solid;
|
824
865
|
$custom-dropdown-font-color: #555;
|
825
|
-
$custom-dropdown-font-size:
|
866
|
+
$custom-dropdown-font-size: em-calc(14);
|
826
867
|
$custom-dropdown-color-selected: #eeeeee;
|
827
868
|
$custom-dropdown-font-color-selected: #000;
|
828
|
-
$custom-dropdown-shadow: 0 2px 2px
|
869
|
+
$custom-dropdown-shadow: 0 2px 2px 0 rgba(0,0,0,0.1);
|
829
870
|
$custom-dropdown-offset-top: none;
|
830
|
-
$custom-dropdown-list-padding:
|
831
|
-
$custom-dropdown-left-padding:
|
832
|
-
$custom-dropdown-right-padding:
|
833
|
-
$custom-dropdown-list-item-min-height:
|
871
|
+
$custom-dropdown-list-padding: em-calc(4);
|
872
|
+
$custom-dropdown-left-padding: em-calc(6);
|
873
|
+
$custom-dropdown-right-padding: em-calc(38);
|
874
|
+
$custom-dropdown-list-item-min-height: em-calc(24);
|
834
875
|
|
835
876
|
|
836
877
|
/* Dropdown Variables */
|
@@ -862,15 +903,15 @@ $f-dropdown-triangle-side-offset: 10px;
|
|
862
903
|
|
863
904
|
$f-dropdown-list-style: none;
|
864
905
|
$f-dropdown-font-color: #555;
|
865
|
-
$f-dropdown-font-size:
|
866
|
-
$f-dropdown-list-padding:
|
867
|
-
$f-dropdown-line-height:
|
906
|
+
$f-dropdown-font-size: em-calc(14);
|
907
|
+
$f-dropdown-list-padding: em-calc(5, 10);
|
908
|
+
$f-dropdown-line-height: em-calc(18);
|
868
909
|
$f-dropdown-list-hover-bg: #eeeeee;
|
869
910
|
$dropdown-mobile-left: 0;
|
870
911
|
|
871
912
|
/* When the dropdown has custom content. */
|
872
913
|
|
873
|
-
$f-dropdown-content-padding:
|
914
|
+
$f-dropdown-content-padding: em-calc(20);
|
874
915
|
|
875
916
|
|
876
917
|
/* Flex Video Variables */
|
@@ -878,9 +919,9 @@ $f-dropdown-content-padding: emCalc(20);
|
|
878
919
|
|
879
920
|
/* Video container padding and margins */
|
880
921
|
|
881
|
-
$flex-video-padding-top:
|
922
|
+
$flex-video-padding-top: em-calc(25);
|
882
923
|
$flex-video-padding-bottom: 67.5%;
|
883
|
-
$flex-video-margin-bottom:
|
924
|
+
$flex-video-margin-bottom: em-calc(16);
|
884
925
|
|
885
926
|
/* Widescreen bottom padding */
|
886
927
|
|
@@ -892,7 +933,7 @@ $flex-video-widescreen-padding-bottom: 57.25%;
|
|
892
933
|
|
893
934
|
/* Margins and padding of the inline list. */
|
894
935
|
|
895
|
-
$inline-list-margin-bottom:
|
936
|
+
$inline-list-margin-bottom: em-calc(17, -22);
|
896
937
|
$inline-list-margin: 0 0;
|
897
938
|
$inline-list-padding: 0;
|
898
939
|
|
@@ -916,7 +957,7 @@ $inline-list-children-display: block;
|
|
916
957
|
|
917
958
|
$joyride-tip-bg: rgb(0,0,0);
|
918
959
|
$joyride-tip-default-width: 300px;
|
919
|
-
$joyride-tip-padding:
|
960
|
+
$joyride-tip-padding: em-calc(18, 20, 24);
|
920
961
|
$joyride-tip-border: solid 1px #555;
|
921
962
|
$joyride-tip-radius: 4px;
|
922
963
|
$joyride-tip-position-offset: 22px;
|
@@ -924,7 +965,7 @@ $joyride-tip-position-offset: 22px;
|
|
924
965
|
/* Tip font styles */
|
925
966
|
|
926
967
|
$joyride-tip-font-color: #fff;
|
927
|
-
$joyride-tip-font-size:
|
968
|
+
$joyride-tip-font-size: em-calc(14);
|
928
969
|
$joyride-tip-header-weight: bold;
|
929
970
|
|
930
971
|
/* Changes the nub size */
|
@@ -954,14 +995,14 @@ $joyride-screenfill: rgba(0,0,0,0.5);
|
|
954
995
|
/* Text styles. */
|
955
996
|
|
956
997
|
$keystroke-font: "Consolas", "Menlo", "Courier", monospace;
|
957
|
-
$keystroke-font-size:
|
998
|
+
$keystroke-font-size: em-calc(15);
|
958
999
|
$keystroke-font-color: #222;
|
959
1000
|
$keystroke-font-color-alt: #fff;
|
960
1001
|
$keystroke-function-factor: 7%;
|
961
1002
|
|
962
1003
|
/* Keystroke padding. */
|
963
1004
|
|
964
|
-
$keystroke-padding:
|
1005
|
+
$keystroke-padding: em-calc(2, 4, 0);
|
965
1006
|
|
966
1007
|
/* Background and border styles. */
|
967
1008
|
|
@@ -977,12 +1018,12 @@ $keystroke-radius: $global-radius;
|
|
977
1018
|
|
978
1019
|
/* Style the labels */
|
979
1020
|
|
980
|
-
$label-padding:
|
1021
|
+
$label-padding: em-calc(3, 10, 4);
|
981
1022
|
$label-radius: $global-radius;
|
982
1023
|
|
983
1024
|
/* We use these to style the label text */
|
984
1025
|
|
985
|
-
$label-font-sizing:
|
1026
|
+
$label-font-sizing: em-calc(14);
|
986
1027
|
$label-font-weight: bold;
|
987
1028
|
$label-font-color: #333;
|
988
1029
|
$label-font-color-alt: #fff;
|
@@ -1026,7 +1067,7 @@ $orbit-bullet-nav-color-active: #222;
|
|
1026
1067
|
|
1027
1068
|
$orbit-slide-number-bg: rgba(0,0,0,0);
|
1028
1069
|
$orbit-slide-number-font-color: #fff;
|
1029
|
-
$orbit-slide-number-padding:
|
1070
|
+
$orbit-slide-number-padding: em-calc(5);
|
1030
1071
|
|
1031
1072
|
/* Graceful Loading Wrapper and preloader */
|
1032
1073
|
|
@@ -1039,20 +1080,20 @@ $preloader-class: "preloader" ;
|
|
1039
1080
|
|
1040
1081
|
/* Pagination container */
|
1041
1082
|
|
1042
|
-
$pagination-height:
|
1043
|
-
$pagination-margin:
|
1083
|
+
$pagination-height: em-calc(24);
|
1084
|
+
$pagination-margin: em-calc(-5);
|
1044
1085
|
|
1045
1086
|
/* List-item properties */
|
1046
1087
|
|
1047
1088
|
$pagination-li-float: $default-float;
|
1048
|
-
$pagination-li-height:
|
1089
|
+
$pagination-li-height: em-calc(24);
|
1049
1090
|
$pagination-li-font-color: #222;
|
1050
|
-
$pagination-li-font-size:
|
1051
|
-
$pagination-li-margin:
|
1091
|
+
$pagination-li-font-size: em-calc(14);
|
1092
|
+
$pagination-li-margin: em-calc(5);
|
1052
1093
|
|
1053
1094
|
/* Pagination anchor links */
|
1054
1095
|
|
1055
|
-
$pagination-link-pad:
|
1096
|
+
$pagination-link-pad: em-calc(1, 7, 1);
|
1056
1097
|
$pagination-link-font-color: #999;
|
1057
1098
|
$pagination-link-active-bg: darken(#fff, 10%);
|
1058
1099
|
|
@@ -1087,8 +1128,8 @@ $panel-border-color: darken($panel-bg, $panel-function-factor);
|
|
1087
1128
|
|
1088
1129
|
/* Inner padding and bottom margin */
|
1089
1130
|
|
1090
|
-
$panel-margin-bottom:
|
1091
|
-
$panel-padding:
|
1131
|
+
$panel-margin-bottom: em-calc(20);
|
1132
|
+
$panel-padding: em-calc(20);
|
1092
1133
|
|
1093
1134
|
/* Font colors */
|
1094
1135
|
|
@@ -1105,33 +1146,33 @@ $price-table-border: solid 1px #ddd;
|
|
1105
1146
|
|
1106
1147
|
/* Bottom margin of the pricing table */
|
1107
1148
|
|
1108
|
-
$price-table-margin-bottom:
|
1149
|
+
$price-table-margin-bottom: em-calc(20);
|
1109
1150
|
|
1110
1151
|
/* Control the title styles */
|
1111
1152
|
|
1112
1153
|
$price-title-bg: #ddd;
|
1113
|
-
$price-title-padding:
|
1154
|
+
$price-title-padding: em-calc(15, 20);
|
1114
1155
|
$price-title-align: center;
|
1115
1156
|
$price-title-color: #333;
|
1116
1157
|
$price-title-weight: bold;
|
1117
|
-
$price-title-size:
|
1158
|
+
$price-title-size: em-calc(16);
|
1118
1159
|
|
1119
1160
|
/* Control the price styles */
|
1120
1161
|
|
1121
1162
|
$price-money-bg: #eee;
|
1122
|
-
$price-money-padding:
|
1163
|
+
$price-money-padding: em-calc(15, 20);
|
1123
1164
|
$price-money-align: center;
|
1124
1165
|
$price-money-color: #333;
|
1125
1166
|
$price-money-weight: normal;
|
1126
|
-
$price-money-size:
|
1167
|
+
$price-money-size: em-calc(20);
|
1127
1168
|
|
1128
1169
|
/* Description styles */
|
1129
1170
|
|
1130
1171
|
$price-bg: #fff;
|
1131
1172
|
$price-desc-color: #777;
|
1132
|
-
$price-desc-padding:
|
1173
|
+
$price-desc-padding: em-calc(15);
|
1133
1174
|
$price-desc-align: center;
|
1134
|
-
$price-desc-font-size:
|
1175
|
+
$price-desc-font-size: em-calc(12);
|
1135
1176
|
$price-desc-weight: normal;
|
1136
1177
|
$price-desc-line-height: 1.4;
|
1137
1178
|
$price-desc-bottom-border: dotted 1px #ddd;
|
@@ -1139,9 +1180,9 @@ $price-desc-bottom-border: dotted 1px #ddd;
|
|
1139
1180
|
/* List item styles */
|
1140
1181
|
|
1141
1182
|
$price-item-color: #333;
|
1142
|
-
$price-item-padding:
|
1183
|
+
$price-item-padding: em-calc(15);
|
1143
1184
|
$price-item-align: center;
|
1144
|
-
$price-item-font-size:
|
1185
|
+
$price-item-font-size: em-calc(14);
|
1145
1186
|
$price-item-weight: normal;
|
1146
1187
|
$price-item-bottom-border: dotted 1px #ddd;
|
1147
1188
|
|
@@ -1149,7 +1190,7 @@ $price-item-bottom-border: dotted 1px #ddd;
|
|
1149
1190
|
|
1150
1191
|
$price-cta-bg: #f5f5f5;
|
1151
1192
|
$price-cta-align: center;
|
1152
|
-
$price-cta-padding:
|
1193
|
+
$price-cta-padding: em-calc(20, 20, 0);
|
1153
1194
|
|
1154
1195
|
|
1155
1196
|
/* Progress Bar Variables */
|
@@ -1157,7 +1198,7 @@ $price-cta-padding: emCalc(20, 20, 0);
|
|
1157
1198
|
|
1158
1199
|
/* Progress bar height */
|
1159
1200
|
|
1160
|
-
$progress-bar-height:
|
1201
|
+
$progress-bar-height: em-calc(25);
|
1161
1202
|
$progress-bar-color: transparent;
|
1162
1203
|
|
1163
1204
|
/* Border styles */
|
@@ -1169,8 +1210,8 @@ $progress-bar-border-radius: $global-radius;
|
|
1169
1210
|
|
1170
1211
|
/* Margin & padding */
|
1171
1212
|
|
1172
|
-
$progress-bar-pad:
|
1173
|
-
$progress-bar-margin-bottom:
|
1213
|
+
$progress-bar-pad: em-calc(2);
|
1214
|
+
$progress-bar-margin-bottom: em-calc(10);
|
1174
1215
|
|
1175
1216
|
/* Meter colors */
|
1176
1217
|
|
@@ -1193,14 +1234,14 @@ $reveal-overlay-bg-old: #000;
|
|
1193
1234
|
$reveal-modal-bg: #fff;
|
1194
1235
|
$reveal-position-top: 50px;
|
1195
1236
|
$reveal-default-width: 80%;
|
1196
|
-
$reveal-modal-padding:
|
1237
|
+
$reveal-modal-padding: em-calc(20);
|
1197
1238
|
$reveal-box-shadow: 0 0 10px rgba(#000,.4);
|
1198
1239
|
|
1199
1240
|
/* Reveal close button */
|
1200
1241
|
|
1201
|
-
$reveal-close-font-size:
|
1202
|
-
$reveal-close-top:
|
1203
|
-
$reveal-close-side:
|
1242
|
+
$reveal-close-font-size: em-calc(22);
|
1243
|
+
$reveal-close-top: em-calc(8);
|
1244
|
+
$reveal-close-side: em-calc(11);
|
1204
1245
|
$reveal-close-color: #aaa;
|
1205
1246
|
$reveal-close-weight: bold;
|
1206
1247
|
|
@@ -1219,8 +1260,8 @@ $close-reveal-modal-class: "close-reveal-modal";
|
|
1219
1260
|
|
1220
1261
|
/* Padding and hover factor */
|
1221
1262
|
|
1222
|
-
$section-title-padding:
|
1223
|
-
$section-content-padding:
|
1263
|
+
$section-title-padding: em-calc(15);
|
1264
|
+
$section-content-padding: em-calc(15);
|
1224
1265
|
$section-function-factor: 10%;
|
1225
1266
|
|
1226
1267
|
/* Titles */
|
@@ -1239,14 +1280,14 @@ $section-border-color: #ccc;
|
|
1239
1280
|
|
1240
1281
|
/* Font controls */
|
1241
1282
|
|
1242
|
-
$section-font-size:
|
1283
|
+
$section-font-size: em-calc(14);
|
1243
1284
|
|
1244
1285
|
/* Control the color of the background and some size options */
|
1245
1286
|
|
1246
1287
|
$section-content-bg: #fff;
|
1247
|
-
$section-vertical-nav-min-width:
|
1248
|
-
$section-vertical-tabs-title-width:
|
1249
|
-
$section-bottom-margin:
|
1288
|
+
$section-vertical-nav-min-width: em-calc(200);
|
1289
|
+
$section-vertical-tabs-title-width: em-calc(200);
|
1290
|
+
$section-bottom-margin: em-calc(20);
|
1250
1291
|
|
1251
1292
|
$title-selector: ".title";
|
1252
1293
|
$content-selector: ".content";
|
@@ -1257,19 +1298,19 @@ $content-selector: ".content";
|
|
1257
1298
|
|
1258
1299
|
/* Padding */
|
1259
1300
|
|
1260
|
-
$side-nav-padding:
|
1301
|
+
$side-nav-padding: em-calc(14, 0);
|
1261
1302
|
|
1262
1303
|
/* List styles */
|
1263
1304
|
|
1264
1305
|
$side-nav-list-type: none;
|
1265
1306
|
$side-nav-list-position: inside;
|
1266
|
-
$side-nav-list-margin:
|
1307
|
+
$side-nav-list-margin: em-calc(0, 0, 7, 0);
|
1267
1308
|
|
1268
1309
|
/* Link styles */
|
1269
1310
|
|
1270
1311
|
$side-nav-link-color: $primary-color;
|
1271
1312
|
$side-nav-link-color-active: lighten(#000, 30%);
|
1272
|
-
$side-nav-font-size:
|
1313
|
+
$side-nav-font-size: em-calc(14);
|
1273
1314
|
$side-nav-font-weight: bold;
|
1274
1315
|
|
1275
1316
|
/* Border styles */
|
@@ -1284,12 +1325,12 @@ $side-nav-divider-color: darken(#fff, 10%);
|
|
1284
1325
|
|
1285
1326
|
/* Margin and padding */
|
1286
1327
|
|
1287
|
-
$sub-nav-list-margin:
|
1288
|
-
$sub-nav-list-padding-top:
|
1328
|
+
$sub-nav-list-margin: em-calc(-4, 0, 18);
|
1329
|
+
$sub-nav-list-padding-top: em-calc(4);
|
1289
1330
|
|
1290
1331
|
/* Definition */
|
1291
1332
|
|
1292
|
-
$sub-nav-font-size:
|
1333
|
+
$sub-nav-font-size: em-calc(14);
|
1293
1334
|
$sub-nav-font-color: #999;
|
1294
1335
|
$sub-nav-font-weight: normal;
|
1295
1336
|
$sub-nav-text-decoration: none;
|
@@ -1300,7 +1341,7 @@ $sub-nav-border-radius: 1000px;
|
|
1300
1341
|
$sub-nav-active-font-weight: bold;
|
1301
1342
|
$sub-nav-active-bg: $primary-color;
|
1302
1343
|
$sub-nav-active-color: #fff;
|
1303
|
-
$sub-nav-active-padding:
|
1344
|
+
$sub-nav-active-padding: em-calc(3, 9);
|
1304
1345
|
$sub-nav-active-cursor: $cursor-default-value;
|
1305
1346
|
|
1306
1347
|
|
@@ -1320,7 +1361,7 @@ $switch-height-tny: 22px;
|
|
1320
1361
|
$switch-height-sml: 28px;
|
1321
1362
|
$switch-height-med: 36px;
|
1322
1363
|
$switch-height-lrg: 44px;
|
1323
|
-
$switch-bottom-margin:
|
1364
|
+
$switch-bottom-margin: em-calc(20);
|
1324
1365
|
|
1325
1366
|
/* Font sizes for our classes. */
|
1326
1367
|
|
@@ -1363,22 +1404,22 @@ $table-border-color: #ddd;
|
|
1363
1404
|
/* Table head styles */
|
1364
1405
|
|
1365
1406
|
$table-head-bg: #f5f5f5;
|
1366
|
-
$table-head-font-size:
|
1407
|
+
$table-head-font-size: em-calc(14);
|
1367
1408
|
$table-head-font-color: #222;
|
1368
1409
|
$table-head-font-weight: bold;
|
1369
|
-
$table-head-padding:
|
1410
|
+
$table-head-padding: em-calc(8, 10, 10);
|
1370
1411
|
|
1371
1412
|
/* Row padding and font styles */
|
1372
1413
|
|
1373
|
-
$table-row-padding:
|
1374
|
-
$table-row-font-size:
|
1414
|
+
$table-row-padding: em-calc(9, 10);
|
1415
|
+
$table-row-font-size: em-calc(14);
|
1375
1416
|
$table-row-font-color: #222;
|
1376
|
-
$table-line-height:
|
1417
|
+
$table-line-height: em-calc(18);
|
1377
1418
|
|
1378
1419
|
/* Display and margin of tables */
|
1379
1420
|
|
1380
1421
|
$table-display: table-cell;
|
1381
|
-
$table-margin-bottom:
|
1422
|
+
$table-margin-bottom: em-calc(20);
|
1382
1423
|
|
1383
1424
|
|
1384
1425
|
/* Image Thumbnail Variables */
|
@@ -1408,16 +1449,16 @@ $has-tip-border-bottom-hover: dotted 1px darken($primary-color, 20%);
|
|
1408
1449
|
$has-tip-font-color-hover: $primary-color;
|
1409
1450
|
$has-tip-cursor-type: help;
|
1410
1451
|
|
1411
|
-
$tooltip-padding:
|
1452
|
+
$tooltip-padding: em-calc(8);
|
1412
1453
|
$tooltip-bg: #000;
|
1413
|
-
$tooltip-font-size:
|
1454
|
+
$tooltip-font-size: em-calc(15);
|
1414
1455
|
$tooltip-font-weight: bold;
|
1415
1456
|
$tooltip-font-color: #fff;
|
1416
1457
|
$tooltip-line-height: 1.3;
|
1417
|
-
$tooltip-close-font-size:
|
1458
|
+
$tooltip-close-font-size: em-calc(10);
|
1418
1459
|
$tooltip-close-font-weight: normal;
|
1419
1460
|
$tooltip-close-font-color: #888;
|
1420
|
-
$tooltip-font-size-sml:
|
1461
|
+
$tooltip-font-size-sml: em-calc(14);
|
1421
1462
|
$tooltip-radius: $global-radius;
|
1422
1463
|
$tooltip-pip-size: 5px;
|
1423
1464
|
|
@@ -1432,7 +1473,7 @@ $topbar-bg: #111 !default;
|
|
1432
1473
|
/* Height and margin */
|
1433
1474
|
|
1434
1475
|
$topbar-height: 45px;
|
1435
|
-
$topbar-margin-bottom:
|
1476
|
+
$topbar-margin-bottom: em-calc(30);
|
1436
1477
|
|
1437
1478
|
/* Control Input height for top bar */
|
1438
1479
|
|
@@ -1441,7 +1482,7 @@ $topbar-input-height: 2.45em;
|
|
1441
1482
|
/* Controlling the styles for the title in the top bar */
|
1442
1483
|
|
1443
1484
|
$topbar-title-weight: bold;
|
1444
|
-
$topbar-title-font-size:
|
1485
|
+
$topbar-title-font-size: em-calc(17);
|
1445
1486
|
|
1446
1487
|
/* Style the top bar dropdown elements */
|
1447
1488
|
|
@@ -1458,7 +1499,7 @@ $topbar-link-color: #fff;
|
|
1458
1499
|
$topbar-link-color-hover: #fff;
|
1459
1500
|
$topbar-link-color-active: #fff;
|
1460
1501
|
$topbar-link-weight: bold;
|
1461
|
-
$topbar-link-font-size:
|
1502
|
+
$topbar-link-font-size: em-calc(13);
|
1462
1503
|
$topbar-link-hover-lightness: -30%; Darken by 30%
|
1463
1504
|
$topbar-link-bg-hover: darken($topbar-bg, 3%);
|
1464
1505
|
$topbar-link-bg-active: darken($topbar-bg, 3%);
|
@@ -1466,12 +1507,12 @@ $topbar-link-bg-active: darken($topbar-bg, 3%);
|
|
1466
1507
|
$topbar-dropdown-label-color: #555;
|
1467
1508
|
$topbar-dropdown-label-text-transform: uppercase;
|
1468
1509
|
$topbar-dropdown-label-font-weight: bold;
|
1469
|
-
$topbar-dropdown-label-font-size:
|
1510
|
+
$topbar-dropdown-label-font-size: em-calc(10);
|
1470
1511
|
|
1471
1512
|
/* Top menu icon styles */
|
1472
1513
|
|
1473
1514
|
$topbar-menu-link-transform: uppercase;
|
1474
|
-
$topbar-menu-link-font-size:
|
1515
|
+
$topbar-menu-link-font-size: em-calc(13);
|
1475
1516
|
$topbar-menu-link-weight: bold;
|
1476
1517
|
$topbar-menu-link-color: #fff;
|
1477
1518
|
$topbar-menu-icon-color: #fff;
|
@@ -1481,7 +1522,7 @@ $topbar-menu-icon-color-toggled: #888;
|
|
1481
1522
|
/* Transitions and breakpoint styles */
|
1482
1523
|
|
1483
1524
|
$topbar-transition-speed: 300ms;
|
1484
|
-
$topbar-breakpoint:
|
1525
|
+
$topbar-breakpoint: em-calc(940);
|
1485
1526
|
$topbar-media-query: "only screen and (min-width: #{$topbar-breakpoint})";
|
1486
1527
|
|
1487
1528
|
/* Divider Styles */
|
@@ -1492,6 +1533,7 @@ $topbar-divider-border-top: solid 1px darken($topbar-bg, 10%);
|
|
1492
1533
|
/* Sticky Class */
|
1493
1534
|
|
1494
1535
|
$topbar-sticky-class: ".sticky";
|
1536
|
+
$topbar-arrows: true; //Set false to remove the triangle icon from the menu item
|
1495
1537
|
', :css %>
|
1496
1538
|
|
1497
1539
|
|