foundation-rails 5.2.0.0 → 5.2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. checksums.yaml +4 -4
  2. data/bower.json +2 -2
  3. data/lib/foundation/rails/version.rb +1 -1
  4. data/vendor/assets/javascripts/foundation/foundation.abide.js +27 -22
  5. data/vendor/assets/javascripts/foundation/foundation.accordion.js +1 -1
  6. data/vendor/assets/javascripts/foundation/foundation.alert.js +2 -2
  7. data/vendor/assets/javascripts/foundation/foundation.clearing.js +6 -6
  8. data/vendor/assets/javascripts/foundation/foundation.dropdown.js +1 -1
  9. data/vendor/assets/javascripts/foundation/foundation.equalizer.js +1 -1
  10. data/vendor/assets/javascripts/foundation/foundation.interchange.js +2 -2
  11. data/vendor/assets/javascripts/foundation/foundation.joyride.js +1 -1
  12. data/vendor/assets/javascripts/foundation/foundation.js +1 -1
  13. data/vendor/assets/javascripts/foundation/foundation.magellan.js +1 -1
  14. data/vendor/assets/javascripts/foundation/foundation.offcanvas.js +1 -1
  15. data/vendor/assets/javascripts/foundation/foundation.orbit.js +13 -8
  16. data/vendor/assets/javascripts/foundation/foundation.reveal.js +1 -1
  17. data/vendor/assets/javascripts/foundation/foundation.slider.js +1 -1
  18. data/vendor/assets/javascripts/foundation/foundation.tab.js +3 -2
  19. data/vendor/assets/javascripts/foundation/foundation.tooltip.js +1 -1
  20. data/vendor/assets/javascripts/foundation/foundation.topbar.js +1 -1
  21. data/vendor/assets/stylesheets/foundation.scss +1 -3
  22. data/vendor/assets/stylesheets/foundation/_settings.scss +40 -3
  23. data/vendor/assets/stylesheets/foundation/components/_accordion.scss +0 -1
  24. data/vendor/assets/stylesheets/foundation/components/_block-grid.scss +1 -1
  25. data/vendor/assets/stylesheets/foundation/components/_buttons.scss +4 -19
  26. data/vendor/assets/stylesheets/foundation/components/_flex-video.scss +1 -1
  27. data/vendor/assets/stylesheets/foundation/components/_forms.scss +5 -5
  28. data/vendor/assets/stylesheets/foundation/components/_global.scss +1 -1
  29. data/vendor/assets/stylesheets/foundation/components/_grid.scss +3 -2
  30. data/vendor/assets/stylesheets/foundation/components/_keystrokes.scss +3 -3
  31. data/vendor/assets/stylesheets/foundation/components/_offcanvas.scss +65 -32
  32. data/vendor/assets/stylesheets/foundation/components/_reveal.scss +1 -1
  33. data/vendor/assets/stylesheets/foundation/components/_tabs.scss +1 -1
  34. data/vendor/assets/stylesheets/foundation/components/_type.scss +1 -1
  35. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d0565600ca266c755998289b8d77379bd0b31ba3
4
- data.tar.gz: 9a4a170972d2b69e39ef97dc7eee314d220777fb
3
+ metadata.gz: 1f0965fc3e4a5d696c852dad76597096c0f9d1d8
4
+ data.tar.gz: 3a98e42c47f5e4add5f6be2984d48c6c31647df4
5
5
  SHA512:
6
- metadata.gz: 23576c610b2b0fee690f757fefb751485a88ea222efc2c4e3403d5b83f322cd27bc2a9d8eb7021232cdf739efed82740e1b09861a7b01adc03b40d9ced67c665
7
- data.tar.gz: e265c33f51a99dfbcb1276dd408a1681bbfa4daa63157dcc6f1a29dc369f6116bafb40d47e92f52a819276305956d88172a63ccb70f7a77eacf0a22acc5a43fa
6
+ metadata.gz: 911c5575a65d51269b66422ea6439506ad4fd35f2e39e76bbd3aedc8da519538b86cc35f9a7dd37c34354c987c1d12024cbd9cde24260d4e43cd1ee5c608b563
7
+ data.tar.gz: 8ee81d522ad33f07b29e704ad42bc47799e754d604c4a114d4e02ea7533ceb971350394f2c20233e6768c78a4b4236e69cce81e369ab04eea72171df8c040949
data/bower.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "foundation-rails",
3
- "version": "5.2.0.0",
3
+ "version": "5.2.1.0",
4
4
  "dependencies": {
5
- "foundation": "5.2.0"
5
+ "foundation": "5.2.1"
6
6
  }
7
7
  }
@@ -1,5 +1,5 @@
1
1
  module Foundation
2
2
  module Rails
3
- VERSION = "5.2.0.0"
3
+ VERSION = "5.2.1.0"
4
4
  end
5
5
  end
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.abide = {
5
5
  name : 'abide',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  settings : {
10
10
  live_validate : true,
@@ -39,6 +39,15 @@
39
39
 
40
40
  // #FFF or #FFFFFF
41
41
  color: /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/
42
+ },
43
+ validators : {
44
+ equalTo: function(el, required, parent) {
45
+ var from = document.getElementById(el.getAttribute(this.add_namespace('data-equalto'))).value,
46
+ to = el.value,
47
+ valid = (from === to);
48
+
49
+ return valid;
50
+ }
42
51
  }
43
52
  },
44
53
 
@@ -135,7 +144,7 @@
135
144
  } else if (pattern.length > 0) {
136
145
  return [el, new RegExp(pattern), required];
137
146
  }
138
-
147
+
139
148
  if (this.settings.patterns.hasOwnProperty(type)) {
140
149
  return [el, this.settings.patterns[type], required];
141
150
  }
@@ -154,13 +163,16 @@
154
163
  required = el_patterns[i][2],
155
164
  value = el.value,
156
165
  direct_parent = this.S(el).parent(),
157
- is_equal = el.getAttribute(this.add_namespace('data-equalto')),
166
+ validator = el.getAttribute(this.add_namespace('data-abide-validator')),
158
167
  is_radio = el.type === "radio",
159
168
  is_checkbox = el.type === "checkbox",
160
169
  label = this.S('label[for="' + el.getAttribute('id') + '"]'),
161
170
  valid_length = (required) ? (el.value.length > 0) : true;
162
171
 
163
- var parent;
172
+ var parent, valid;
173
+
174
+ // support old way to do equalTo validations
175
+ if(el.getAttribute(this.add_namespace('data-equalto'))) { validator = "equalTo" }
164
176
 
165
177
  if (!direct_parent.is('label')) {
166
178
  parent = direct_parent;
@@ -172,8 +184,17 @@
172
184
  validations.push(this.valid_radio(el, required));
173
185
  } else if (is_checkbox && required) {
174
186
  validations.push(this.valid_checkbox(el, required));
175
- } else if (is_equal && required) {
176
- validations.push(this.valid_equal(el, required, parent));
187
+ } else if (validator) {
188
+ valid = this.settings.validators[validator].apply(this, [el, required, parent])
189
+ validations.push(valid);
190
+
191
+ if (valid) {
192
+ this.S(el).removeAttr(this.invalid_attr);
193
+ parent.removeClass('error');
194
+ } else {
195
+ this.S(el).attr(this.invalid_attr, '');
196
+ parent.addClass('error');
197
+ }
177
198
  } else {
178
199
 
179
200
  if (el_patterns[i][1].test(value) && valid_length ||
@@ -231,22 +252,6 @@
231
252
  }
232
253
  }
233
254
 
234
- return valid;
235
- },
236
-
237
- valid_equal: function(el, required, parent) {
238
- var from = document.getElementById(el.getAttribute(this.add_namespace('data-equalto'))).value,
239
- to = el.value,
240
- valid = (from === to);
241
-
242
- if (valid) {
243
- this.S(el).removeAttr(this.invalid_attr);
244
- parent.removeClass('error');
245
- } else {
246
- this.S(el).attr(this.invalid_attr, '');
247
- parent.addClass('error');
248
- }
249
-
250
255
  return valid;
251
256
  }
252
257
  };
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.accordion = {
5
5
  name : 'accordion',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  settings : {
10
10
  active_class: 'active',
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.alert = {
5
5
  name : 'alert',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  settings : {
10
10
  animation: 'fadeOut',
@@ -26,7 +26,7 @@
26
26
 
27
27
  e.preventDefault();
28
28
  alertBox[settings.animation](settings.speed, function () {
29
- S(this).trigger('closed').remove();
29
+ S(this).trigger('close').remove();
30
30
  settings.callback();
31
31
  });
32
32
  });
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.clearing = {
5
5
  name : 'clearing',
6
6
 
7
- version: '5.2.0',
7
+ version: '5.2.1',
8
8
 
9
9
  settings : {
10
10
  templates : {
@@ -67,8 +67,8 @@
67
67
 
68
68
  // if clearing is open and the current image is
69
69
  // clicked, go to the next image in sequence
70
- if (target.hasClass('visible') &&
71
- current[0] === target[0] &&
70
+ if (target.hasClass('visible') &&
71
+ current[0] === target[0] &&
72
72
  next.length > 0 && self.is_open(current)) {
73
73
  target = next;
74
74
  image = S('img', target);
@@ -202,7 +202,7 @@
202
202
  container.addClass('clearing-container');
203
203
  visible_image.show();
204
204
  this.fix_height(target)
205
- .caption(self.S('.clearing-caption', visible_image), $image)
205
+ .caption(self.S('.clearing-caption', visible_image), self.S('img', target))
206
206
  .center_and_label(image, label)
207
207
  .shift(current, target, function () {
208
208
  target.siblings().removeClass('visible');
@@ -217,7 +217,7 @@
217
217
  .css('visibility', 'hidden');
218
218
 
219
219
  startLoad.call(this);
220
-
220
+
221
221
  }
222
222
  },
223
223
 
@@ -391,7 +391,7 @@
391
391
  // image caption
392
392
 
393
393
  caption : function (container, $image) {
394
- var caption = $image.data('caption');
394
+ var caption = $image.attr('data-caption');
395
395
 
396
396
  if (caption) {
397
397
  container
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.dropdown = {
5
5
  name : 'dropdown',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  settings : {
10
10
  active_class: 'open',
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.equalizer = {
5
5
  name : 'equalizer',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  settings : {
10
10
  use_tallest: true,
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.interchange = {
5
5
  name : 'interchange',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  cache : {},
10
10
 
@@ -15,7 +15,7 @@
15
15
  load_attr : 'interchange',
16
16
 
17
17
  named_queries : {
18
- 'default' : Foundation.media_queries.small,
18
+ 'default' : 'only screen',
19
19
  small : Foundation.media_queries.small,
20
20
  medium : Foundation.media_queries.medium,
21
21
  large : Foundation.media_queries.large,
@@ -6,7 +6,7 @@
6
6
  Foundation.libs.joyride = {
7
7
  name : 'joyride',
8
8
 
9
- version : '5.2.0',
9
+ version : '5.2.1',
10
10
 
11
11
  defaults : {
12
12
  expose : false, // turn on or off the expose feature
@@ -276,7 +276,7 @@
276
276
  window.Foundation = {
277
277
  name : 'Foundation',
278
278
 
279
- version : '5.2.0',
279
+ version : '5.2.1',
280
280
 
281
281
  media_queries : {
282
282
  small : S('.foundation-mq-small').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''),
@@ -4,7 +4,7 @@
4
4
  Foundation.libs['magellan-expedition'] = {
5
5
  name : 'magellan-expedition',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  settings : {
10
10
  active_class: 'active',
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.offcanvas = {
5
5
  name : 'offcanvas',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  settings : {},
10
10
 
@@ -39,7 +39,7 @@
39
39
  };
40
40
 
41
41
  self.update_active_link = function(index) {
42
- var link = $('a[data-orbit-link="'+self.slides().eq(index).attr('data-orbit-slide')+'"]');
42
+ var link = $('[data-orbit-link="'+self.slides().eq(index).attr('data-orbit-slide')+'"]');
43
43
  link.siblings().removeClass(settings.bullets_active_class);
44
44
  link.addClass(settings.bullets_active_class);
45
45
  };
@@ -275,8 +275,6 @@
275
275
  container.on('click', self.toggle_timer);
276
276
  if (settings.swipe) {
277
277
  slides_container.on('touchstart.fndtn.orbit',function(e) {
278
- e.preventDefault();
279
- e.stopPropagation();
280
278
  if (self.cache.animating) {return;}
281
279
  if (!e.touches) {e = e.originalEvent;}
282
280
 
@@ -290,11 +288,15 @@
290
288
  self.stop_timer(); // does not appear to prevent callback from occurring
291
289
  })
292
290
  .on('touchmove.fndtn.orbit',function(e) {
293
- if (self.cache.animating) {return;}
294
- e.preventDefault();
295
- e.stopPropagation();
291
+ if (Math.abs(self.cache.delta_x) > 5) {
292
+ e.preventDefault();
293
+ e.stopPropagation();
294
+ }
295
+
296
+ if (self.cache.animating) {return;}
296
297
  requestAnimationFrame(function(){
297
298
  if (!e.touches) { e = e.originalEvent; }
299
+
298
300
  // Ignore pinch/zoom events
299
301
  if(e.touches.length > 1 || e.scale && e.scale !== 1) return;
300
302
 
@@ -304,7 +306,9 @@
304
306
  self.cache.is_scrolling = !!( self.cache.is_scrolling || Math.abs(self.cache.delta_x) < Math.abs(e.touches[0].pageY - self.cache.start_page_y) );
305
307
  }
306
308
 
307
- if (self.cache.is_scrolling) {return;}
309
+ if (self.cache.is_scrolling) {
310
+ return;
311
+ }
308
312
 
309
313
  var direction = (self.cache.delta_x < 0) ? (idx+1) : (idx-1);
310
314
  if (self.cache.direction !== direction) {
@@ -382,6 +386,7 @@
382
386
  el.addClass(settings.timer_paused_class);
383
387
  left = -1;
384
388
  self.update_progress(0);
389
+ self.start();
385
390
  };
386
391
 
387
392
  this.start = function() {
@@ -445,7 +450,7 @@
445
450
  Foundation.libs.orbit = {
446
451
  name: 'orbit',
447
452
 
448
- version: '5.2.0',
453
+ version: '5.2.1',
449
454
 
450
455
  settings: {
451
456
  animation: 'slide',
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.reveal = {
5
5
  name : 'reveal',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  locked : false,
10
10
 
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.slider = {
5
5
  name : 'slider',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  settings: {
10
10
  start: 0,
@@ -5,7 +5,7 @@
5
5
  Foundation.libs.tab = {
6
6
  name : 'tab',
7
7
 
8
- version : '5.2.0',
8
+ version : '5.2.1',
9
9
 
10
10
  settings : {
11
11
  active_class: 'active',
@@ -138,7 +138,8 @@
138
138
  siblings.removeClass(settings.active_class);
139
139
  target.siblings().removeClass(settings.active_class).end().addClass(settings.active_class);
140
140
  settings.callback(tab);
141
- tabs.triggerHandler('toggled', [tab]);
141
+ target.triggerHandler('toggled', [tab]);
142
+ tabs.triggerHandler('toggled', [target]);
142
143
  },
143
144
 
144
145
  data_attr: function (str) {
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.tooltip = {
5
5
  name : 'tooltip',
6
6
 
7
- version : '5.2.0',
7
+ version : '5.2.1',
8
8
 
9
9
  settings : {
10
10
  additional_inheritable_classes : [],
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.topbar = {
5
5
  name : 'topbar',
6
6
 
7
- version: '5.2.0',
7
+ version: '5.2.1',
8
8
 
9
9
  settings : {
10
10
  index : 0,
@@ -7,6 +7,7 @@
7
7
 
8
8
  // Behold, here are all the Foundation components.
9
9
  @import
10
+ "foundation/components/grid",
10
11
  "foundation/components/accordion",
11
12
  "foundation/components/alert-boxes",
12
13
  "foundation/components/block-grid",
@@ -18,7 +19,6 @@
18
19
  "foundation/components/dropdown-buttons",
19
20
  "foundation/components/flex-video",
20
21
  "foundation/components/forms",
21
- "foundation/components/grid",
22
22
  "foundation/components/inline-lists",
23
23
  "foundation/components/joyride",
24
24
  "foundation/components/keystrokes",
@@ -43,5 +43,3 @@
43
43
  "foundation/components/type",
44
44
  "foundation/components/offcanvas",
45
45
  "foundation/components/visibility";
46
-
47
- // * { border-radius: 500px !important; }
@@ -275,6 +275,7 @@
275
275
  // We use this to control the maximum number of block grid elements per row
276
276
  // $block-grid-elements: 12;
277
277
  // $block-grid-default-spacing: rem-calc(20);
278
+ // $align-block-grid-to-grid: true;
278
279
 
279
280
  // Enables media queries for block-grid classes. Set to false if writing semantic HTML.
280
281
  // $block-grid-media-queries: true;
@@ -592,7 +593,7 @@
592
593
 
593
594
  // Keystrokes
594
595
 
595
- // $include-html-type-classes: $include-html-classes;
596
+ // $include-html-keystroke-classes: $include-html-classes;
596
597
 
597
598
  // We use these to control text styles.
598
599
  // $keystroke-font: "Consolas", "Menlo", "Courier", monospace;
@@ -679,8 +680,10 @@
679
680
  // $tabbar-menu-icon-padding: 0;
680
681
 
681
682
  // $tabbar-hamburger-icon-width: rem-calc(16);
682
- // $tabbar-hamburger-icon-left: rem-calc(13);
683
- // $tabbar-hamburger-icon-top: rem-calc(5);
683
+ // $tabbar-hamburger-icon-left: false;
684
+ // $tabbar-hamburger-icon-top: false;
685
+ // $tapbar-hamburger-icon-thickness: 1px;
686
+ // $tapbar-hamburger-icon-gap: 6px;
684
687
 
685
688
  // Off Canvas Back-Link Overlay
686
689
  // $off-canvas-overlay-transition: background 300ms ease;
@@ -1201,3 +1204,37 @@
1201
1204
  // $include-html-visibility-classes: $include-html-classes;
1202
1205
  // $include-table-visibility-classes: true;
1203
1206
  // $include-legacy-visibility-classes: true;
1207
+
1208
+ //
1209
+ // RANGE SLIDER
1210
+ //
1211
+
1212
+ // $include-html-range-slider-classes: $include-html-classes;
1213
+
1214
+ // These variabels define the slider bar styles
1215
+ // $range-slider-bar-width: 100%;
1216
+ // $range-slider-bar-height: rem-calc(16);
1217
+
1218
+ // $range-slider-bar-border-width: 1px;
1219
+ // $range-slider-bar-border-style: solid;
1220
+ // $range-slider-bar-border-color: #ddd;
1221
+ // $range-slider-radius: $global-radius;
1222
+ // $range-slider-round: $global-rounded;
1223
+ // $range-slider-bar-bg-color: #fafafa;
1224
+
1225
+ // Vertical bar styles
1226
+ // $range-slider-vertical-bar-width: rem-calc(16);
1227
+ // $range-slider-vertical-bar-height: rem-calc(200);
1228
+
1229
+ // These variabels define the slider handle styles
1230
+ // $range-slider-handle-width: rem-calc(32);
1231
+ // $range-slider-handle-height: rem-calc(22);
1232
+ // $range-slider-handle-position-top: rem-calc(-5);
1233
+ // $range-slider-handle-bg-color: $primary-color;
1234
+ // $range-slider-handle-border-width: 1px;
1235
+ // $range-slider-handle-border-style: solid;
1236
+ // $range-slider-handle-border-color: none;
1237
+ // $range-slider-handle-radius: $global-radius;
1238
+ // $range-slider-handle-round: $global-rounded;
1239
+ // $range-slider-handle-bg-hover-color: scale-color($primary-color, $lightness: -12%);
1240
+ // $range-slider-handle-cursor: pointer;
@@ -3,7 +3,6 @@
3
3
  // Licensed under MIT Open Source
4
4
 
5
5
  @import "global";
6
- @import "grid";
7
6
 
8
7
  //
9
8
  // @variables
@@ -13,7 +13,7 @@ $include-html-grid-classes: $include-html-classes !default;
13
13
  $block-grid-elements: 12 !default;
14
14
  $block-grid-default-spacing: rem-calc(20) !default;
15
15
 
16
- $align-block-grid-to-grid: true;
16
+ $align-block-grid-to-grid: true !default;
17
17
  @if $align-block-grid-to-grid {
18
18
  $block-grid-default-spacing: $column-gutter;
19
19
  }
@@ -75,9 +75,8 @@ $button-disabled-opacity: 0.7 !default;
75
75
  //
76
76
  // $padding - Used to build padding for buttons Default: $button-med ||= rem-calc(12)
77
77
  // $full-width - We can set $full-width:true to remove side padding extend width - Default: false
78
- // $is-input - <input>'s and <button>'s take on strange padding. We added this to help fix that. Default: false
79
78
 
80
- @mixin button-size($padding:$button-med, $full-width:false, $is-input:false) {
79
+ @mixin button-size($padding:$button-med, $full-width:false) {
81
80
 
82
81
  // We control which padding styles come through,
83
82
  // these can be turned off by setting $padding:false
@@ -109,20 +108,6 @@ $button-disabled-opacity: 0.7 !default;
109
108
  padding-left: 0;
110
109
  width: 100%;
111
110
  }
112
-
113
- // <input>'s and <button>'s take on strange padding. We added this to help fix that.
114
- @if $is-input == $button-lrg {
115
- padding-top: $is-input + rem-calc(.5);
116
- padding-bottom: $is-input + rem-calc(.5);
117
- -webkit-appearance: none;
118
- font-weight: $button-font-weight !important;
119
- }
120
- @else if $is-input {
121
- padding-top: $is-input + rem-calc(1);
122
- padding-bottom: $is-input;
123
- -webkit-appearance: none;
124
- font-weight: $button-font-weight !important;
125
- }
126
111
  }
127
112
 
128
113
  // @MIXIN
@@ -187,9 +172,9 @@ $button-disabled-opacity: 0.7 !default;
187
172
  // $disabled - We can set $disabled:true to create a disabled transparent button. Default:false.
188
173
  // $is-input - <input>'s and <button>'s take on strange padding. We added this to help fix that. Default:false.
189
174
  // $is-prefix - Not used? Default:false.
190
- @mixin button($padding:$button-med, $bg:$primary-color, $radius:false, $full-width:false, $disabled:false, $is-input:false, $is-prefix:false) {
175
+ @mixin button($padding:$button-med, $bg:$primary-color, $radius:false, $full-width:false, $disabled:false, $is-prefix:false) {
191
176
  @include button-base;
192
- @include button-size($padding, $full-width, $is-input);
177
+ @include button-size($padding, $full-width);
193
178
  @include button-style($bg, $radius, $disabled);
194
179
  }
195
180
 
@@ -204,7 +189,7 @@ $button-disabled-opacity: 0.7 !default;
204
189
  @include button-style;
205
190
 
206
191
  @include single-transition(background-color);
207
- @include button-size($padding:$button-med, $full-width:false, $is-input:false);
192
+ @include button-size($padding:$button-med, $full-width:false);
208
193
 
209
194
  &.secondary { @include button-style($bg:$secondary-color); }
210
195
  &.success { @include button-style($bg:$success-color); }
@@ -15,7 +15,7 @@ $flex-video-padding-bottom: 67.5% !default;
15
15
  $flex-video-margin-bottom: rem-calc(16) !default;
16
16
 
17
17
  // We use this to control widescreen bottom padding
18
- $flex-video-widescreen-padding-bottom: 56.55% !default;
18
+ $flex-video-widescreen-padding-bottom: 56.34% !default;
19
19
 
20
20
  //
21
21
  // @mixins
@@ -179,8 +179,8 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
179
179
  border-width: $input-prefix-border-size;
180
180
  overflow: $input-prefix-overflow;
181
181
  font-size: $form-label-font-size;
182
- height: ($form-label-font-size + ($form-spacing * 1.5) - rem-calc(1));
183
- line-height: ($form-label-font-size + ($form-spacing * 1.5) - rem-calc(1));
182
+ height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
183
+ line-height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
184
184
  }
185
185
 
186
186
  // @MIXIN
@@ -331,7 +331,7 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
331
331
  background-color: $select-bg-color;
332
332
  background-image: url('data:image/svg+xml;base64, PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgeD0iMHB4IiB5PSIwcHgiIHdpZHRoPSI2cHgiIGhlaWdodD0iM3B4IiB2aWV3Qm94PSIwIDAgNiAzIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA2IDMiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwb2x5Z29uIHBvaW50cz0iNS45OTIsMCAyLjk5MiwzIC0wLjAwOCwwICIvPjwvc3ZnPg==');
333
333
  background-repeat: no-repeat;
334
- background-position: center $opposite-direction 3%;
334
+ background-position: if($text-direction == 'rtl', 3%, 97%) center;
335
335
  border: $input-border-width $input-border-style $input-border-color;
336
336
  padding: $form-spacing / 2;
337
337
  font-size: $input-font-size;
@@ -356,8 +356,8 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
356
356
  .postfix { @include prefix-postfix-base; }
357
357
 
358
358
  /* Adjust padding, alignment and radius if pre/post element is a button */
359
- .postfix.button { @include button-size(false,false,false); @include postfix(false, false, true); }
360
- .prefix.button { @include button-size(false,false,false); @include prefix(false, false, true); }
359
+ .postfix.button { @include button-size(false,false); @include postfix(false, false, true); }
360
+ .prefix.button { @include button-size(false,false); @include prefix(false, false, true); }
361
361
 
362
362
  .prefix.button.radius { @include radius(0); @include side-radius($default-float, $button-radius); }
363
363
  .postfix.button.radius { @include radius(0); @include side-radius($opposite-direction, $button-radius); }
@@ -298,7 +298,7 @@ $cursor-text-value: text !default;
298
298
  @if $include-html-global-classes {
299
299
 
300
300
  meta.foundation-version {
301
- font-family: "/5.2.0/";
301
+ font-family: "/5.2.1/";
302
302
  }
303
303
  // Used to provide media query values for javascript components.
304
304
  // Forward slash placed around everything to convince PhantomJS to read the value.
@@ -101,7 +101,8 @@ $total-columns: 12 !default;
101
101
  $position:false) {
102
102
 
103
103
  // If positioned for default .column, include relative position
104
- @if $position {
104
+ // push and pull require position set
105
+ @if $position or $push or $pull {
105
106
  position: relative;
106
107
  }
107
108
 
@@ -160,7 +161,7 @@ $total-columns: 12 !default;
160
161
  .columns.#{$size}-uncentered {
161
162
  margin-#{$default-float}: 0;
162
163
  margin-#{$opposite-direction}: 0;
163
- float: $default-float;
164
+ float: $default-float !important;
164
165
  }
165
166
 
166
167
  .column.#{$size}-uncentered.opposite,
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // @variables
9
9
  //
10
- $include-html-type-classes: $include-html-classes !default;
10
+ $include-html-keystroke-classes: $include-html-classes !default;
11
11
 
12
12
  // We use these to control text styles.
13
13
  $keystroke-font: "Consolas", "Menlo", "Courier", monospace !default;
@@ -51,11 +51,11 @@ $keystroke-radius: $global-radius !default;
51
51
  }
52
52
 
53
53
  @include exports("keystroke") {
54
- @if $include-html-type-classes {
54
+ @if $include-html-keystroke-classes {
55
55
  .keystroke,
56
56
  kbd {
57
57
  @include keystroke;
58
58
  @include radius($keystroke-radius);
59
59
  }
60
60
  }
61
- }
61
+ }
@@ -54,8 +54,10 @@ $tabbar-menu-icon-line-height: rem-calc(33) !default;
54
54
  $tabbar-menu-icon-padding: 0 !default;
55
55
 
56
56
  $tabbar-hamburger-icon-width: rem-calc(16) !default;
57
- $tabbar-hamburger-icon-left: rem-calc(13) !default;
58
- $tabbar-hamburger-icon-top: rem-calc(5) !default;
57
+ $tabbar-hamburger-icon-left: false !default;
58
+ $tabbar-hamburger-icon-top: false !default;
59
+ $tapbar-hamburger-icon-thickness: 1px !default;
60
+ $tapbar-hamburger-icon-gap: 6px !default;
59
61
 
60
62
  // Off Canvas Back-Link Overlay
61
63
  $off-canvas-overlay-transition: background 300ms ease !default;
@@ -260,6 +262,65 @@ $menu-slide: "transform 500ms ease" !default;
260
262
  }
261
263
  }
262
264
 
265
+ // @MIXIN
266
+ //
267
+ // We use this mixin to generate hamburger icon
268
+ //
269
+ // $width - Width of hamburger icon in rem Default: $tabbar-hamburger-icon-width.
270
+ // $left - If false, icon will be centered horizontally || explicitly set value in rem Default: $tabbar-hamburger-icon-left= False
271
+ // $top - If false, icon will be centered vertically || explicitly set value in rem Default: $tabbar-hamburger-icon-top= False
272
+ // $thickness - thickness of lines in hamburger icon, set value in px Default: $tapbar-hamburger-icon-thickness = 1px
273
+ // $gap - spacing between the lines in hamburger icon, set value in px Default: $tapbar-hamburger-icon-gap = 6px
274
+ // $color - icon color Default: $tabbar-menu-icon-color
275
+ // $hover-color - icon color when hovered Default: $tabbar-menu-icon-hover
276
+ @mixin hamburger($width:$tabbar-hamburger-icon-width,
277
+ $left: $tabbar-hamburger-icon-left,
278
+ $top: $tabbar-hamburger-icon-top,
279
+ $thickness:$tapbar-hamburger-icon-thickness,
280
+ $gap:$tapbar-hamburger-icon-gap,
281
+ $color:$tabbar-menu-icon-color,
282
+ $hover-color:$tabbar-menu-icon-hover) {
283
+ span {
284
+ position: absolute;
285
+ display: block;
286
+ height: 0;
287
+ width: $width;
288
+
289
+ // disable height centering if $top is not false
290
+ @if $top {
291
+ top: $tabbar-hamburger-icon-top;
292
+ }
293
+ @else {
294
+ top: ($tabbar-menu-icon-height - rem-calc(3 * $thickness) - rem-calc(2 * $gap))/2;
295
+ }
296
+ // disable width centering if $top is not false
297
+ @if $left {
298
+ left: $tabbar-hamburger-icon-left;
299
+ }
300
+ @else {
301
+ left: ($tabbar-menu-icon-width - $width)/2;
302
+ }
303
+ @if $experimental {
304
+ -webkit-box-shadow: 1px 0px 1px $thickness $color,
305
+ 1px ($gap + $thickness) 1px $thickness $color,
306
+ 1px (2*$gap + 2*$thickness) 1px $thickness $color;
307
+ }
308
+ box-shadow: 0 0px 0 $thickness $color,
309
+ 0 $gap + $thickness 0 $thickness $color,
310
+ 0 (2 * $gap + 2*$thickness) 0 $thickness $color;
311
+ }
312
+ &:hover span {
313
+ @if $experimental {
314
+ -webkit-box-shadow: 1px 0px 1px $thickness $hover-color,
315
+ 1px ($gap + $thickness) 1px $thickness $hover-color,
316
+ 1px (2*$gap + 2*$thickness) 1px $thickness $hover-color;
317
+ }
318
+ box-shadow: 0 0px 0 $thickness $hover-color,
319
+ 0 $gap + $thickness 0 $thickness $hover-color,
320
+ 0 (2 * $gap + 2*$thickness) 0 $thickness $hover-color;
321
+ }
322
+ }
323
+
263
324
  //
264
325
  // DEFAULT CLASSES
265
326
  //
@@ -289,35 +350,7 @@ $menu-slide: "transform 500ms ease" !default;
289
350
  position: relative;
290
351
 
291
352
  // this is the actual hamburger icon
292
- span {
293
- position: absolute;
294
- display: block;
295
- width: $tabbar-hamburger-icon-width;
296
- height: 0;
297
- left: $tabbar-hamburger-icon-left;
298
- top: $tabbar-hamburger-icon-top;
299
- // margin-top: $tabbar-height / 4;
300
-
301
- @if $experimental {
302
- -webkit-box-shadow: 1px 10px 1px 1px $tabbar-menu-icon-color,
303
- 1px 16px 1px 1px $tabbar-menu-icon-color,
304
- 1px 22px 1px 1px $tabbar-menu-icon-color;
305
- }
306
- box-shadow: 0 10px 0 1px $tabbar-menu-icon-color,
307
- 0 16px 0 1px $tabbar-menu-icon-color,
308
- 0 22px 0 1px $tabbar-menu-icon-color;
309
- }
310
-
311
- &:hover span {
312
- @if $experimental {
313
- -webkit-box-shadow: 1px 10px 1px 1px $tabbar-menu-icon-hover,
314
- 1px 16px 1px 1px $tabbar-menu-icon-hover,
315
- 1px 22px 1px 1px $tabbar-menu-icon-hover;
316
- }
317
- box-shadow: 0 10px 0 1px $tabbar-menu-icon-hover,
318
- 0 16px 0 1px $tabbar-menu-icon-hover,
319
- 0 22px 0 1px $tabbar-menu-icon-hover;
320
- }
353
+ @include hamburger();
321
354
  }
322
355
 
323
356
  .left-off-canvas-menu { @include off-canvas-menu($position: left); }
@@ -362,4 +395,4 @@ $menu-slide: "transform 500ms ease" !default;
362
395
  }
363
396
 
364
397
  }
365
- }
398
+ }
@@ -66,7 +66,7 @@ $close-reveal-modal-class: "close-reveal-modal" !default;
66
66
  visibility: hidden;
67
67
  display: none;
68
68
  position: absolute;
69
- z-index: 99;
69
+ z-index: 100;
70
70
  width: 100vw;
71
71
  top:0;
72
72
  #{$default-float}: 0;
@@ -71,7 +71,7 @@ $tabs-vertical-navigation-margin-bottom: 1.25rem !default;
71
71
  float: $default-float;
72
72
  padding: $tabs-content-padding 0;
73
73
  width: 100%;
74
- &.active { display: block; }
74
+ &.active { display: block; float: none; }
75
75
  &.contained { padding: $tabs-content-padding; }
76
76
  }
77
77
  &.vertical {
@@ -344,7 +344,7 @@ $text-breakpoint-up-queries:
344
344
  border: $hr-border-style $hr-border-color;
345
345
  border-width: $hr-border-width 0 0;
346
346
  clear: both;
347
- margin: $hr-margin 0 ($hr-margin - em-calc(strip-unit($hr-border-width)));
347
+ margin: $hr-margin 0 ($hr-margin - rem-calc($hr-border-width));
348
348
  height: 0;
349
349
  }
350
350
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foundation-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.2.0.0
4
+ version: 5.2.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - ZURB
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-06 00:00:00.000000000 Z
11
+ date: 2014-03-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
230
230
  version: '0'
231
231
  requirements: []
232
232
  rubyforge_project:
233
- rubygems_version: 2.1.11
233
+ rubygems_version: 2.0.3
234
234
  signing_key:
235
235
  specification_version: 4
236
236
  summary: ZURB Foundation on Sass/Compass