zurb-foundation 4.0.7 → 4.0.8
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile.lock +1 -1
- data/README.md +1 -0
- data/docs/CHANGELOG.md +12 -0
- data/docs/components/block-grid.html.erb +4 -4
- data/docs/components/grid.html.erb +2 -2
- data/docs/components/labels.html.erb +1 -1
- data/docs/components/orbit.html.erb +1 -1
- data/docs/components/pagination.html.erb +1 -1
- data/docs/components/section.html.erb +4 -4
- data/docs/components/top-bar.html.erb +5 -5
- data/docs/components/type.html.erb +1 -0
- data/docs/javascript.html.erb +1 -1
- data/docs/sass.html.erb +2 -3
- data/js/foundation/foundation.js +21 -6
- data/js/foundation/foundation.reveal.js +1 -1
- data/js/foundation/foundation.section.js +55 -39
- data/js/foundation/foundation.topbar.js +1 -1
- data/lib/foundation/version.rb +1 -1
- data/scss/foundation/components/_block-grid.scss +1 -1
- data/scss/foundation/components/_buttons.scss +1 -1
- data/scss/foundation/components/_forms.scss +11 -12
- data/scss/foundation/components/_grid.scss +12 -11
- data/scss/foundation/components/_labels.scss +4 -3
- data/scss/foundation/components/_section.scss +7 -7
- data/scss/foundation/components/_type.scss +2 -0
- data/templates/project/scss/_settings.scss +16 -1
- metadata +3 -3
data/Gemfile.lock
CHANGED
data/README.md
CHANGED
@@ -45,6 +45,7 @@ Joomla
|
|
45
45
|
Drupal
|
46
46
|
|
47
47
|
* [Drupal Theme](https://github.com/drewkennelly/foundation7) by Drew Kennelly
|
48
|
+
* [Zoundation Theme](http://drupal.org/project/zoundation) by [Andrea Burton](https://twitter.com/andreaburton) & [Jeff Graham](https://twitter.com/jgraham909), FunnyMonkey
|
48
49
|
|
49
50
|
PyroCMS
|
50
51
|
|
data/docs/CHANGELOG.md
CHANGED
@@ -1,3 +1,15 @@
|
|
1
|
+
### 4.0.8- March 15, 2013
|
2
|
+
* Added paragraph `text-rendering` variable: `$paragraph-text-rendering`.
|
3
|
+
* Changed blockgrid to use clearfix instead of overflow.
|
4
|
+
* Fixed nested row margin inside forms.
|
5
|
+
* Fixed data_options function that caused booleans to be interpreted as numbers.
|
6
|
+
* Tabs no longer automatically convert to accordion on desktop.
|
7
|
+
* Sections with accordion class always remain accordions and sections with tab class always remain tabs.
|
8
|
+
* Vertical and horizontal navigation elements still become accordions on mobile
|
9
|
+
|
10
|
+
You can compare the commits [here](https://github.com/zurb/foundation/compare/v4.0.7...v4.0.8).
|
11
|
+
|
12
|
+
|
1
13
|
### 4.0.7- March 14, 2013
|
2
14
|
* Fixed problem with buggy pull request that made radius buttons look like ovals, sorry.
|
3
15
|
|
@@ -10,10 +10,10 @@
|
|
10
10
|
<h4 class="subheader">Block grids give you a way to evenly split contents of a list within the grid. If you wanted to create a row of 5 images or paragraphs that need to stay evenly spaced no matter the screen size, the block grid is for you.</h4>
|
11
11
|
|
12
12
|
<ul class="small-block-grid-2 large-block-grid-4">
|
13
|
-
<li><img src="../img/demos/demo1.jpg"></li>
|
14
|
-
<li><img src="../img/demos/demo2.jpg"></li>
|
15
|
-
<li><img src="../img/demos/demo3.jpg"></li>
|
16
|
-
<li><img src="../img/demos/demo4.jpg"></li>
|
13
|
+
<li><img class="th" src="../img/demos/demo1.jpg"></li>
|
14
|
+
<li><img class="th" src="../img/demos/demo2.jpg"></li>
|
15
|
+
<li><img class="th" src="../img/demos/demo3.jpg"></li>
|
16
|
+
<li><img class="th" src="../img/demos/demo4.jpg"></li>
|
17
17
|
</ul>
|
18
18
|
|
19
19
|
<hr>
|
@@ -330,8 +330,8 @@ $float: false
|
|
330
330
|
|
331
331
|
<%= code_example '
|
332
332
|
#masthead { @include grid-row; @include panel;
|
333
|
-
& > hgroup { @include grid-column(4
|
334
|
-
& > section { @include grid-column(8
|
333
|
+
& > hgroup { @include grid-column(4); }
|
334
|
+
& > section { @include grid-column(8); }
|
335
335
|
}', :css %>
|
336
336
|
|
337
337
|
<header id="masthead">
|
@@ -85,7 +85,7 @@ $label-padding: emCalc(3px) emCalc(6px) emCalc(4px);
|
|
85
85
|
$label-radius: $global-radius;
|
86
86
|
|
87
87
|
/* We use these to style the label text */
|
88
|
-
$label-font-
|
88
|
+
$label-font-sizing: emCalc(14px);
|
89
89
|
$label-font-weight: bold;', :css %>
|
90
90
|
|
91
91
|
<p><strong>Note:</strong> <code>emCalc();</code> is a function we wrote to convert <code>px</code> to <code>em</code>. It is included in <strong>_foundation-global.scss</strong>.</p>
|
@@ -218,7 +218,7 @@ $stack-on-small-margin-bottom: emCalc(20px); // Stack on small does not function
|
|
218
218
|
<hr>
|
219
219
|
|
220
220
|
<h3>Using the JavaScript</h3>
|
221
|
-
<p>You'll need to include <code>foundation.orbit.js</code> if you want to use Orbit. You'll also need to make sure to include <code>zepto.js</code> and/or <code>jquery.js</code> along with <code>foundation.js</code> above the Orbit plugin. Above your closing <code></body></code> tag include the
|
221
|
+
<p>You'll need to include <code>foundation.orbit.js</code> if you want to use Orbit. You'll also need to make sure to include <code>zepto.js</code> and/or <code>jquery.js</code> along with <code>foundation.js</code> above the Orbit plugin. Above your closing <code></body></code> tag include the Foundation library and either Zepto or jQuery.</p>
|
222
222
|
|
223
223
|
<p><a href="../javascript.html" title="How to install Foundation JavaScript">Read how to install Foundation JavaScript</a></p>
|
224
224
|
|
@@ -34,7 +34,7 @@
|
|
34
34
|
<ul class="disc">
|
35
35
|
<li>To create the arrows, make sure you have <code><li class="arrow"></code> as your first and last list items.</li>
|
36
36
|
<li>To mark the current page, use <code><li class="current"></code></li>
|
37
|
-
<li>Add a class of <code>.
|
37
|
+
<li>Add a class of <code>.unavailable</code> to a list item to make it not clickable, like for the ellipsis in the middle.</li>
|
38
38
|
<li>The page numbers and symbols are always inside of an anchor that you'll link to the page.</li>
|
39
39
|
</ul>
|
40
40
|
|
@@ -11,7 +11,7 @@
|
|
11
11
|
|
12
12
|
<div class="row">
|
13
13
|
<div class="large-3 columns">
|
14
|
-
<div class="section-container vertical-nav" data-section
|
14
|
+
<div class="section-container vertical-nav" data-section>
|
15
15
|
<section class="section">
|
16
16
|
<p class="title"><a href="#">Section 1</a></p>
|
17
17
|
<div class="content">
|
@@ -39,7 +39,7 @@
|
|
39
39
|
</div>
|
40
40
|
</div>
|
41
41
|
<div class="large-9 columns">
|
42
|
-
<div class="section-container horizontal-nav" data-section
|
42
|
+
<div class="section-container horizontal-nav" data-section>
|
43
43
|
<section class="section">
|
44
44
|
<p class="title"><a href="#">Section 1</a></p>
|
45
45
|
<div class="content">
|
@@ -65,7 +65,7 @@
|
|
65
65
|
</div>
|
66
66
|
</section>
|
67
67
|
</div>
|
68
|
-
<div class="section-container tabs" data-section data-options="deep_linking: true">
|
68
|
+
<div class="section-container tabs" data-section data-options="deep_linking: true;">
|
69
69
|
<section class="section">
|
70
70
|
<p class="title"><a href="#panel1">Section 1</a></p>
|
71
71
|
<div class="content" data-slug="panel1">
|
@@ -167,7 +167,7 @@
|
|
167
167
|
</div>
|
168
168
|
</section>
|
169
169
|
</div>', :html %>
|
170
|
-
|
170
|
+
|
171
171
|
<h6>Tabs/Accordion</h6>
|
172
172
|
<p>Adding a <code>tabs</code> class to the section container will enable tabs on large screens and show an accordion on small screens.</p>
|
173
173
|
<%= code_example '
|
@@ -22,12 +22,12 @@
|
|
22
22
|
<section class="top-bar-section">
|
23
23
|
<ul class="left">
|
24
24
|
<li class="divider"></li>
|
25
|
-
<li class="has-dropdown"><a href="<%= features_path %>">Item 1
|
25
|
+
<li class="has-dropdown"><a href="<%= features_path %>">Item 1</a>
|
26
26
|
|
27
27
|
<ul class="dropdown">
|
28
|
-
|
28
|
+
<li><label>Level One</label></li>
|
29
29
|
<li><a href="#">Sub-item 1</a></li>
|
30
|
-
|
30
|
+
<li><a href="#">Sub-item 2</a></li>
|
31
31
|
<li class="divider"></li>
|
32
32
|
<li><a href="#">Sub-item 3</a></li>
|
33
33
|
<li class="has-dropdown"><a href="#">Sub-item 4</a>
|
@@ -56,10 +56,10 @@
|
|
56
56
|
<li><a href="#">Sub-item 4</a>
|
57
57
|
</ul>
|
58
58
|
</li>
|
59
|
-
<li><a href="#">Sub-item 5</a></li>
|
59
|
+
<li><a href="#">Sub-item 5</a></li>
|
60
60
|
</ul>
|
61
61
|
</li>
|
62
|
-
|
62
|
+
<li class="divider"></li>
|
63
63
|
</ul>
|
64
64
|
<!-- Right Nav Section -->
|
65
65
|
<ul class="right">
|
@@ -298,6 +298,7 @@ $paragraph-margin-bottom: emCalc(20px);
|
|
298
298
|
$paragraph-aside-font-size: emCalc(14px);
|
299
299
|
$paragraph-aside-line-height: 1.35;
|
300
300
|
$paragraph-aside-font-style: italic;
|
301
|
+
$paragraph-text-rendering: optimizeLegibility;
|
301
302
|
|
302
303
|
/* We use these to style <code> tags */
|
303
304
|
$code-color: darken($alert-color, 15%);
|
data/docs/javascript.html.erb
CHANGED
@@ -53,7 +53,7 @@
|
|
53
53
|
</script>
|
54
54
|
', :html %>
|
55
55
|
|
56
|
-
<p><strong>Note:</strong> We include tested versions of jQuery and Zepto in the Foundation repo to get you started quickly. If you want to build your own version of Zepto, Foundation employs the <i>fx_methods</i>, <i>assets</i>, <i>data</i>, <i>selector</i>, and <i>stack</i> modules.</p>
|
56
|
+
<p><strong>Note:</strong> We include tested versions of jQuery and Zepto in the Foundation repo to get you started quickly. If you want to build your own version of Zepto, Foundation employs the <i>event</i>, <i>fx_methods</i>, <i>assets</i>, <i>data</i>, <i>selector</i>, and <i>stack</i> modules.</p>
|
57
57
|
|
58
58
|
<hr>
|
59
59
|
|
data/docs/sass.html.erb
CHANGED
@@ -59,9 +59,6 @@
|
|
59
59
|
<p>If you want to pick and choose which pieces of Foundation you want, the pieces you need are:</p>
|
60
60
|
|
61
61
|
<%= code_example '
|
62
|
-
@import "foundation/foundation-global";
|
63
|
-
@import "foundation/components/global";
|
64
|
-
|
65
62
|
/* Each individual part that can be added in */
|
66
63
|
@import "foundation/components/grid";
|
67
64
|
@import "foundation/components/visibility";
|
@@ -206,6 +203,8 @@ bundle exec compass create . -r zurb-foundation --using foundation
|
|
206
203
|
|
207
204
|
<%= code_example '
|
208
205
|
// Foundation Global Function, Variables and Mixins
|
206
|
+
@import "foundation/components/global";
|
207
|
+
|
209
208
|
//
|
210
209
|
// Variables
|
211
210
|
//
|
data/js/foundation/foundation.js
CHANGED
@@ -98,7 +98,7 @@ if (typeof jQuery === "undefined" &&
|
|
98
98
|
window.Foundation = {
|
99
99
|
name : 'Foundation',
|
100
100
|
|
101
|
-
version : '4.0.
|
101
|
+
version : '4.0.8',
|
102
102
|
|
103
103
|
// global Foundation cache object
|
104
104
|
cache : {},
|
@@ -108,7 +108,7 @@ if (typeof jQuery === "undefined" &&
|
|
108
108
|
args = [scope, method, options, response],
|
109
109
|
responses = [],
|
110
110
|
nc = nc || false;
|
111
|
-
|
111
|
+
|
112
112
|
// disable library error catching,
|
113
113
|
// used for development only
|
114
114
|
if (nc) this.nc = nc;
|
@@ -189,16 +189,31 @@ if (typeof jQuery === "undefined" &&
|
|
189
189
|
}
|
190
190
|
},
|
191
191
|
|
192
|
+
random_str : function (length) {
|
193
|
+
var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz'.split('');
|
194
|
+
|
195
|
+
if (!length) {
|
196
|
+
length = Math.floor(Math.random() * chars.length);
|
197
|
+
}
|
198
|
+
|
199
|
+
var str = '';
|
200
|
+
for (var i = 0; i < length; i++) {
|
201
|
+
str += chars[Math.floor(Math.random() * chars.length)];
|
202
|
+
}
|
203
|
+
return str;
|
204
|
+
},
|
205
|
+
|
192
206
|
libs : {},
|
193
207
|
|
194
208
|
// methods that can be inherited in libraries
|
195
209
|
lib_methods : {
|
196
210
|
set_data : function (node, data) {
|
197
211
|
// this.name references the name of the library calling this method
|
198
|
-
var id = this.name
|
212
|
+
var id = [this.name,+new Date(),Foundation.random_str(5)].join('-');
|
199
213
|
|
200
214
|
Foundation.cache[id] = data;
|
201
215
|
node.attr('data-' + this.name + '-id', id);
|
216
|
+
return data;
|
202
217
|
},
|
203
218
|
|
204
219
|
get_data : function (node) {
|
@@ -228,7 +243,7 @@ if (typeof jQuery === "undefined" &&
|
|
228
243
|
};
|
229
244
|
},
|
230
245
|
|
231
|
-
// parses data-options attribute on
|
246
|
+
// parses data-options attribute on nodes and turns
|
232
247
|
// them into an object
|
233
248
|
data_options : function (el) {
|
234
249
|
var opts = {}, ii, p,
|
@@ -236,7 +251,7 @@ if (typeof jQuery === "undefined" &&
|
|
236
251
|
opts_len = opts_arr.length;
|
237
252
|
|
238
253
|
function isNumber (o) {
|
239
|
-
return ! isNaN (o-0) && o !== null && o !== "" && o !== false;
|
254
|
+
return ! isNaN (o-0) && o !== null && o !== "" && o !== false && o !== true;
|
240
255
|
}
|
241
256
|
|
242
257
|
function trim(str) {
|
@@ -252,7 +267,7 @@ if (typeof jQuery === "undefined" &&
|
|
252
267
|
if (/false/i.test(p[1])) p[1] = false;
|
253
268
|
if (isNumber(p[1])) p[1] = parseInt(p[1], 10);
|
254
269
|
|
255
|
-
if (p.length === 2) {
|
270
|
+
if (p.length === 2 && p[0].length > 0) {
|
256
271
|
opts[trim(p[0])] = trim(p[1]);
|
257
272
|
}
|
258
273
|
}
|
@@ -6,7 +6,7 @@
|
|
6
6
|
Foundation.libs.section = {
|
7
7
|
name: 'section',
|
8
8
|
|
9
|
-
version : '4.0.
|
9
|
+
version : '4.0.8',
|
10
10
|
|
11
11
|
settings : {
|
12
12
|
deep_linking: false,
|
@@ -15,18 +15,16 @@
|
|
15
15
|
},
|
16
16
|
|
17
17
|
init : function (scope, method, options) {
|
18
|
+
var self = this;
|
19
|
+
|
18
20
|
this.scope = scope || this.scope;
|
19
21
|
Foundation.inherit(this, 'throttle data_options');
|
20
22
|
|
21
|
-
if (typeof method === 'object') {
|
22
|
-
$.extend(true, this.settings, method);
|
23
|
-
}
|
24
|
-
|
25
23
|
if (typeof method != 'string') {
|
26
24
|
this.set_active_from_hash();
|
27
|
-
|
25
|
+
this.events();
|
28
26
|
|
29
|
-
return
|
27
|
+
return true;
|
30
28
|
} else {
|
31
29
|
return this[method].call(this, options);
|
32
30
|
}
|
@@ -34,31 +32,36 @@
|
|
34
32
|
|
35
33
|
events : function () {
|
36
34
|
var self = this;
|
37
|
-
$(this.scope).on('click.fndtn.section', '[data-section] .title', function (e) {
|
38
|
-
$.extend(true, self.settings, self.data_options($(this).closest('[data-section]')));
|
39
|
-
self.toggle_active.call(this, e, self);
|
40
|
-
});
|
41
35
|
|
42
|
-
$(
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
if (!self.settings.toggled){
|
47
|
-
self.set_active_from_hash();
|
48
|
-
$(this).trigger('resize');
|
49
|
-
}
|
50
|
-
}).trigger('resize');
|
36
|
+
$(this.scope)
|
37
|
+
.on('click.fndtn.section', '[data-section] .title', function (e) {
|
38
|
+
var $this = $(this),
|
39
|
+
section = $this.closest('[data-section]');
|
51
40
|
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
}
|
59
|
-
|
41
|
+
self.toggle_active.call(this, e, self);
|
42
|
+
});
|
43
|
+
|
44
|
+
$(window)
|
45
|
+
.on('resize.fndtn.section', self.throttle(function () {
|
46
|
+
self.resize.call(this);
|
47
|
+
}, 30))
|
48
|
+
.on('hashchange', function () {
|
49
|
+
if (!self.settings.toggled){
|
50
|
+
self.set_active_from_hash();
|
51
|
+
$(this).trigger('resize');
|
52
|
+
}
|
53
|
+
}).trigger('resize');
|
54
|
+
|
55
|
+
$(document)
|
56
|
+
.on('click.fndtn.section', function (e) {
|
57
|
+
if ($(e.target).closest('.title').length < 1) {
|
58
|
+
$('[data-section].vertical-nav, [data-section].horizontal-nav')
|
59
|
+
.find('section, .section')
|
60
|
+
.removeClass('active')
|
61
|
+
.attr('style', '');
|
62
|
+
}
|
63
|
+
});
|
60
64
|
|
61
|
-
this.settings.init = true;
|
62
65
|
},
|
63
66
|
|
64
67
|
toggle_active : function (e, self) {
|
@@ -66,10 +69,12 @@
|
|
66
69
|
section = $this.closest('section, .section'),
|
67
70
|
content = section.find('.content'),
|
68
71
|
parent = section.closest('[data-section]'),
|
69
|
-
self = Foundation.libs.section
|
72
|
+
self = Foundation.libs.section,
|
73
|
+
settings = $.extend({}, self.settings, self.data_options(parent));
|
74
|
+
|
70
75
|
self.settings.toggled = true;
|
71
76
|
|
72
|
-
if (!
|
77
|
+
if (!settings.deep_linking && content.length > 0) {
|
73
78
|
e.preventDefault();
|
74
79
|
}
|
75
80
|
|
@@ -86,7 +91,7 @@
|
|
86
91
|
var prev_active_section = null,
|
87
92
|
title_height = self.outerHeight(section.find('.title'));
|
88
93
|
|
89
|
-
if (self.small(parent) ||
|
94
|
+
if (self.small(parent) || settings.one_up) {
|
90
95
|
prev_active_section = $this.closest('[data-section]').find('section.active, .section.active');
|
91
96
|
|
92
97
|
if (self.small(parent)) {
|
@@ -103,14 +108,17 @@
|
|
103
108
|
}
|
104
109
|
|
105
110
|
section.addClass('active');
|
111
|
+
|
106
112
|
if (prev_active_section !== null) {
|
107
113
|
prev_active_section.removeClass('active').attr('style', '');
|
108
114
|
}
|
109
115
|
}
|
116
|
+
|
110
117
|
setTimeout(function () {
|
111
118
|
self.settings.toggled = false;
|
112
119
|
}, 300);
|
113
|
-
|
120
|
+
|
121
|
+
settings.callback();
|
114
122
|
},
|
115
123
|
|
116
124
|
resize : function () {
|
@@ -119,7 +127,9 @@
|
|
119
127
|
|
120
128
|
sections.each(function() {
|
121
129
|
var $this = $(this),
|
122
|
-
active_section = $this.find('section.active, .section.active')
|
130
|
+
active_section = $this.find('section.active, .section.active'),
|
131
|
+
settings = $.extend({}, self.settings, self.data_options($this));
|
132
|
+
|
123
133
|
if (active_section.length > 1) {
|
124
134
|
active_section
|
125
135
|
.not(':first')
|
@@ -129,6 +139,7 @@
|
|
129
139
|
&& !self.is_vertical($this)
|
130
140
|
&& !self.is_horizontal($this)
|
131
141
|
&& !self.is_accordion($this)) {
|
142
|
+
|
132
143
|
var first = $this.find('section, .section').first();
|
133
144
|
first.addClass('active');
|
134
145
|
|
@@ -144,6 +155,7 @@
|
|
144
155
|
} else {
|
145
156
|
active_section.css('padding-top', self.outerHeight(active_section.find('.title')));
|
146
157
|
}
|
158
|
+
|
147
159
|
self.position_titles($this);
|
148
160
|
|
149
161
|
if (self.is_horizontal($this) && !self.small($this)) {
|
@@ -172,10 +184,10 @@
|
|
172
184
|
self = this;
|
173
185
|
|
174
186
|
sections.each(function () {
|
175
|
-
var section = $(this)
|
176
|
-
|
187
|
+
var section = $(this),
|
188
|
+
settings = $.extend({}, self.settings, self.data_options(section));
|
177
189
|
|
178
|
-
if (hash.length > 0 &&
|
190
|
+
if (hash.length > 0 && settings.deep_linking) {
|
179
191
|
section
|
180
192
|
.find('section, .section')
|
181
193
|
.attr('style', '')
|
@@ -231,6 +243,10 @@
|
|
231
243
|
},
|
232
244
|
|
233
245
|
small : function (el) {
|
246
|
+
var settings = $.extend({}, this.settings, this.data_options(el));
|
247
|
+
if (el && el.hasClass('tabs')) {
|
248
|
+
return false;
|
249
|
+
}
|
234
250
|
if (el && this.is_accordion(el)) {
|
235
251
|
return true;
|
236
252
|
}
|
@@ -246,7 +262,7 @@
|
|
246
262
|
off : function () {
|
247
263
|
$(this.scope).off('.fndtn.section');
|
248
264
|
$(window).off('.fndtn.section');
|
249
|
-
|
265
|
+
$(document).off('.fndtn.section')
|
250
266
|
}
|
251
267
|
};
|
252
|
-
}(Foundation.zj, this, this.document));
|
268
|
+
}(Foundation.zj, this, this.document));
|
data/lib/foundation/version.rb
CHANGED
@@ -170,7 +170,7 @@ $button-disabled-opacity: 0.6 !default;
|
|
170
170
|
&.large { @include button-size($padding:$button-lrg); }
|
171
171
|
&.small { @include button-size($padding:$button-sml); }
|
172
172
|
&.tiny { @include button-size($padding:$button-tny); }
|
173
|
-
&.expand { @include button-size(
|
173
|
+
&.expand { @include button-size(false,$full-width:true); }
|
174
174
|
|
175
175
|
&.left-align { text-align: left; text-indent: emCalc(12px); }
|
176
176
|
&.right-align { text-align: right; padding-right: emCalc(12px); }
|
@@ -245,21 +245,20 @@ $input-error-message-font-color-alt: #333 !default;
|
|
245
245
|
@if $include-html-form-classes {
|
246
246
|
/* Standard Forms */
|
247
247
|
form { margin: 0 0 $form-spacing; }
|
248
|
-
|
248
|
+
|
249
249
|
/* Using forms within rows, we need to set some defaults */
|
250
250
|
form .row { @include form-row-base; }
|
251
|
-
|
252
|
-
|
251
|
+
|
253
252
|
/* Label Styles */
|
254
253
|
label { @include form-label;
|
255
254
|
&.right { @include form-label(right,false); }
|
256
255
|
&.inline { @include form-label(inline,false); }
|
257
256
|
}
|
258
|
-
|
257
|
+
|
259
258
|
/* Attach elements to the beginning or end of an input */
|
260
259
|
.prefix,
|
261
260
|
.postfix { @include prefix-postfix-base; }
|
262
|
-
|
261
|
+
|
263
262
|
/* Adjust padding, alignment and radius if pre/post element is a button */
|
264
263
|
.postfix.button { @include button-size(false,false,false); @include postfix(false,true); }
|
265
264
|
.prefix.button { @include button-size(false,false,false); @include prefix(false,true); }
|
@@ -267,7 +266,7 @@ $input-error-message-font-color-alt: #333 !default;
|
|
267
266
|
.postfix.button.radius { @include side-radius(right, $global-radius); }
|
268
267
|
.prefix.button.round { @include side-radius(left, 1000px); }
|
269
268
|
.postfix.button.round { @include side-radius(right, 1000px); }
|
270
|
-
|
269
|
+
|
271
270
|
/* Separate prefix and postfix styles when on span so buttons keep their own */
|
272
271
|
span.prefix { @include prefix();
|
273
272
|
&.radius { @include side-radius(left, $global-radius); }
|
@@ -275,7 +274,7 @@ $input-error-message-font-color-alt: #333 !default;
|
|
275
274
|
span.postfix { @include postfix();
|
276
275
|
&.radius { @include side-radius(right, $global-radius); }
|
277
276
|
}
|
278
|
-
|
277
|
+
|
279
278
|
/* Input groups will automatically style first and last elements of the group */
|
280
279
|
.input-group {
|
281
280
|
&.radius {
|
@@ -295,7 +294,7 @@ $input-error-message-font-color-alt: #333 !default;
|
|
295
294
|
}
|
296
295
|
}
|
297
296
|
}
|
298
|
-
|
297
|
+
|
299
298
|
/* We use this to get basic styling on all basic form elements */
|
300
299
|
input[type="text"],
|
301
300
|
input[type="password"],
|
@@ -314,12 +313,12 @@ $input-error-message-font-color-alt: #333 !default;
|
|
314
313
|
@include form-element;
|
315
314
|
@include single-transition(all, 0.15s, linear);
|
316
315
|
}
|
317
|
-
|
316
|
+
|
318
317
|
/* We add basic fieldset styling */
|
319
318
|
fieldset {
|
320
319
|
@include fieldset;
|
321
320
|
}
|
322
|
-
|
321
|
+
|
323
322
|
/* Error Handling */
|
324
323
|
.error input,
|
325
324
|
input.error,
|
@@ -327,10 +326,10 @@ $input-error-message-font-color-alt: #333 !default;
|
|
327
326
|
textarea.error {
|
328
327
|
@include form-error-color;
|
329
328
|
}
|
330
|
-
|
329
|
+
|
331
330
|
.error label,
|
332
331
|
label.error { @include form-label-error-color; }
|
333
|
-
|
332
|
+
|
334
333
|
.error small,
|
335
334
|
small.error {
|
336
335
|
@include form-error-message;
|
@@ -53,7 +53,7 @@ $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:left) {
|
57
57
|
|
58
58
|
position: relative;
|
59
59
|
|
@@ -88,10 +88,11 @@ $total-columns: 12 !default;
|
|
88
88
|
@if $center {
|
89
89
|
margin-left: auto;
|
90
90
|
margin-right: auto;
|
91
|
+
float: none !important;
|
91
92
|
}
|
92
93
|
|
93
94
|
@if $float {
|
94
|
-
@if $float == left { float: $default-float; }
|
95
|
+
@if $float == left or true { float: $default-float; }
|
95
96
|
@else if $float == right { float: $default-opposite; }
|
96
97
|
@else { float: none; }
|
97
98
|
}
|
@@ -121,37 +122,37 @@ $total-columns: 12 !default;
|
|
121
122
|
@media only screen {
|
122
123
|
|
123
124
|
.row .column,
|
124
|
-
.row .columns { @include grid-column($columns:false
|
125
|
+
.row .columns { @include grid-column($columns:false); }
|
125
126
|
|
126
127
|
@for $i from 1 through $total-columns {
|
127
|
-
.row .small#{-$i} { @include grid-column($columns:$i,$collapse:null); }
|
128
|
+
.row .small#{-$i} { @include grid-column($columns:$i,$collapse:null,$float:false); }
|
128
129
|
}
|
129
130
|
|
130
131
|
@for $i from 1 through $total-columns - 2 {
|
131
|
-
.row .small-offset-#{$i} { @include grid-column($offset:$i, $collapse:null); }
|
132
|
+
.row .small-offset-#{$i} { @include grid-column($offset:$i, $collapse:null,$float:false); }
|
132
133
|
}
|
133
134
|
|
134
135
|
[class*="column"] + [class*="column"]:last-child { float: $default-opposite; }
|
135
136
|
[class*="column"] + [class*="column"].end { float: $default-float; }
|
136
137
|
|
137
138
|
.column.small-centered,
|
138
|
-
.columns.small-centered { @include grid-column($center:true, $collapse:null, $float:
|
139
|
+
.columns.small-centered { @include grid-column($center:true, $collapse:null, $float:false); }
|
139
140
|
}
|
140
141
|
|
141
142
|
/* Styles for screens that are atleast 768px; */
|
142
143
|
@media #{$small} {
|
143
144
|
|
144
145
|
@for $i from 1 through $total-columns {
|
145
|
-
.row .large#{-$i} { @include grid-column($columns:$i,$collapse:null); }
|
146
|
+
.row .large#{-$i} { @include grid-column($columns:$i,$collapse:null,$float:false); }
|
146
147
|
}
|
147
148
|
|
148
149
|
@for $i from 1 through $total-columns - 2 {
|
149
|
-
.row .large-offset-#{$i} { @include grid-column($offset:$i, $collapse:null); }
|
150
|
+
.row .large-offset-#{$i} { @include grid-column($offset:$i, $collapse:null,$float:false); }
|
150
151
|
}
|
151
152
|
|
152
153
|
@for $i from 2 through $total-columns - 2 {
|
153
|
-
.push#{-$i} { @include grid-column($push:$i, $collapse:null); }
|
154
|
-
.pull#{-$i} { @include grid-column($pull:$i, $collapse:null); }
|
154
|
+
.push#{-$i} { @include grid-column($push:$i, $collapse:null, $float:false); }
|
155
|
+
.pull#{-$i} { @include grid-column($pull:$i, $collapse:null, $float:false); }
|
155
156
|
}
|
156
157
|
|
157
158
|
@for $i from 2 through $total-columns - 2 {
|
@@ -160,7 +161,7 @@ $total-columns: 12 !default;
|
|
160
161
|
}
|
161
162
|
|
162
163
|
.column.large-centered,
|
163
|
-
.columns.large-centered { @include grid-column($center:true, $collapse:null, $float:
|
164
|
+
.columns.large-centered { @include grid-column($center:true, $collapse:null, $float:false); }
|
164
165
|
|
165
166
|
}
|
166
167
|
|
@@ -7,7 +7,7 @@ $label-padding: emCalc(3px) emCalc(10px) emCalc(4px) !default;
|
|
7
7
|
$label-radius: $global-radius !default;
|
8
8
|
|
9
9
|
// We use these to style the label text
|
10
|
-
$label-font-
|
10
|
+
$label-font-sizing: emCalc(14px) !default;
|
11
11
|
$label-font-weight: bold !default;
|
12
12
|
|
13
13
|
//
|
@@ -26,7 +26,7 @@ $label-font-weight: bold !default;
|
|
26
26
|
}
|
27
27
|
|
28
28
|
// We use this mixin to add label size styles.
|
29
|
-
@mixin label-size($padding:$label-padding, $text-size:$label-font-
|
29
|
+
@mixin label-size($padding:$label-padding, $text-size:$label-font-sizing) {
|
30
30
|
@if $padding { padding: $padding; }
|
31
31
|
@if $text-size { font-size: $text-size; }
|
32
32
|
}
|
@@ -54,7 +54,8 @@ $label-font-weight: bold !default;
|
|
54
54
|
}
|
55
55
|
|
56
56
|
// We use this to add close buttons to alerts
|
57
|
-
@mixin label($padding:$label-padding, $text-size:$label-font-
|
57
|
+
@mixin label($padding:$label-padding, $text-size:$label-font-sizing, $bg:$primary-color, $radius:false) {
|
58
|
+
|
58
59
|
@include label-base;
|
59
60
|
@include label-size($padding, $text-size);
|
60
61
|
@include label-style($bg, $radius);
|
@@ -210,6 +210,13 @@ $section-bottom-margin: emCalc(20px) !default;
|
|
210
210
|
.section { @include section; }
|
211
211
|
}
|
212
212
|
|
213
|
+
.section-container.tabs {
|
214
|
+
@include section-container(false, tabs);
|
215
|
+
|
216
|
+
section,
|
217
|
+
.section { @include section(tabs); }
|
218
|
+
}
|
219
|
+
|
213
220
|
@media #{$small} {
|
214
221
|
|
215
222
|
.section-container.accordion .section {
|
@@ -229,13 +236,6 @@ $section-bottom-margin: emCalc(20px) !default;
|
|
229
236
|
section,
|
230
237
|
.section { @include section(horizontal-nav); }
|
231
238
|
}
|
232
|
-
|
233
|
-
.section-container.tabs {
|
234
|
-
@include section-container(false, tabs);
|
235
|
-
|
236
|
-
section,
|
237
|
-
.section { @include section(tabs); }
|
238
|
-
}
|
239
239
|
}
|
240
240
|
|
241
241
|
}
|
@@ -40,6 +40,7 @@ $paragraph-margin-bottom: emCalc(20px) !default;
|
|
40
40
|
$paragraph-aside-font-size: emCalc(14px) !default;
|
41
41
|
$paragraph-aside-line-height: 1.35 !default;
|
42
42
|
$paragraph-aside-font-style: italic !default;
|
43
|
+
$paragraph-text-rendering: optimizeLegibility !default;
|
43
44
|
|
44
45
|
// We use these to style <code> tags
|
45
46
|
$code-color: darken($alert-color, 15%) !default;
|
@@ -160,6 +161,7 @@ p {
|
|
160
161
|
font-size: $paragraph-font-size;
|
161
162
|
line-height: $paragraph-line-height;
|
162
163
|
margin-bottom: $paragraph-margin-bottom;
|
164
|
+
text-rendering: $paragraph-text-rendering;
|
163
165
|
|
164
166
|
&.lead { @extend %lead; }
|
165
167
|
|
@@ -46,6 +46,21 @@
|
|
46
46
|
// $include-html-classes: true;
|
47
47
|
// $include-print-styles: true;
|
48
48
|
|
49
|
+
// Modular html classes
|
50
|
+
// $include-html-grid-classes: $include-html-classes;
|
51
|
+
// $include-html-visibility-classes: $include-html-classes;
|
52
|
+
// $include-html-button-classes: $include-html-classes;
|
53
|
+
// $include-html-form-classes: $include-html-classes;
|
54
|
+
// $include-html-media-classes: $include-html-classes;
|
55
|
+
// $include-html-section-classes: $include-html-classes;
|
56
|
+
// $include-html-reveal-classes: $include-html-classes;
|
57
|
+
// $include-html-alert-classes: $include-html-classes;
|
58
|
+
// $include-html-nav-classes: $include-html-classes;
|
59
|
+
// $include-html-label-classes: $include-html-classes;
|
60
|
+
// $include-html-panel-classes: $include-html-classes;
|
61
|
+
// $include-html-pricing-classes: $include-html-classes;
|
62
|
+
// $include-html-progress-classes: $include-html-classes;
|
63
|
+
|
49
64
|
//
|
50
65
|
// Grid Variables
|
51
66
|
//
|
@@ -584,7 +599,7 @@
|
|
584
599
|
// $label-radius: $global-radius;
|
585
600
|
|
586
601
|
// We use these to style the label text
|
587
|
-
// $label-font-
|
602
|
+
// $label-font-sizing: emCalc(14px);
|
588
603
|
// $label-font-weight: bold;
|
589
604
|
|
590
605
|
//
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: zurb-foundation
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.0.
|
4
|
+
version: 4.0.8
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -229,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
229
229
|
version: '0'
|
230
230
|
segments:
|
231
231
|
- 0
|
232
|
-
hash: -
|
232
|
+
hash: -2268811908877619416
|
233
233
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
234
234
|
none: false
|
235
235
|
requirements:
|
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
238
238
|
version: '0'
|
239
239
|
segments:
|
240
240
|
- 0
|
241
|
-
hash: -
|
241
|
+
hash: -2268811908877619416
|
242
242
|
requirements: []
|
243
243
|
rubyforge_project:
|
244
244
|
rubygems_version: 1.8.23
|