foundation-rails 5.1.0.1 → 5.1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +6 -0
  3. data/bower.json +2 -2
  4. data/lib/foundation/rails/engine.rb +4 -1
  5. data/lib/foundation/rails/templates/application.html.haml +3 -3
  6. data/lib/foundation/rails/templates/application.html.slim +1 -1
  7. data/lib/foundation/rails/version.rb +1 -1
  8. data/vendor/assets/javascripts/foundation/foundation.abide.js +1 -1
  9. data/vendor/assets/javascripts/foundation/foundation.accordion.js +1 -1
  10. data/vendor/assets/javascripts/foundation/foundation.alert.js +1 -1
  11. data/vendor/assets/javascripts/foundation/foundation.clearing.js +1 -1
  12. data/vendor/assets/javascripts/foundation/foundation.dropdown.js +1 -1
  13. data/vendor/assets/javascripts/foundation/foundation.equalizer.js +2 -1
  14. data/vendor/assets/javascripts/foundation/foundation.interchange.js +1 -1
  15. data/vendor/assets/javascripts/foundation/foundation.joyride.js +1 -1
  16. data/vendor/assets/javascripts/foundation/foundation.js +1 -1
  17. data/vendor/assets/javascripts/foundation/foundation.magellan.js +8 -8
  18. data/vendor/assets/javascripts/foundation/foundation.offcanvas.js +1 -1
  19. data/vendor/assets/javascripts/foundation/foundation.orbit.js +1 -1
  20. data/vendor/assets/javascripts/foundation/foundation.reveal.js +1 -1
  21. data/vendor/assets/javascripts/foundation/foundation.tab.js +1 -1
  22. data/vendor/assets/javascripts/foundation/foundation.tooltip.js +1 -1
  23. data/vendor/assets/javascripts/foundation/foundation.topbar.js +1 -1
  24. data/vendor/assets/stylesheets/foundation/_functions.scss +16 -16
  25. data/vendor/assets/stylesheets/foundation/_settings.scss +1 -1
  26. data/vendor/assets/stylesheets/foundation/components/_button-groups.scss +7 -6
  27. data/vendor/assets/stylesheets/foundation/components/_forms.scss +6 -5
  28. data/vendor/assets/stylesheets/foundation/components/_global.scss +7 -7
  29. data/vendor/assets/stylesheets/foundation/components/_offcanvas.scss +3 -2
  30. data/vendor/assets/stylesheets/foundation/components/_top-bar.scss +18 -16
  31. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2a91edad2d0aa9d012f21be4826ffe70ed4d60bd
4
- data.tar.gz: e2b77d4c9a12372a84418407d85bd25684f50304
3
+ metadata.gz: 4f7470ef8271351ab6f7ba5a15740edfa392dcd4
4
+ data.tar.gz: f20728834e6c9cab6cd7e0e9da2f25ca1cc16722
5
5
  SHA512:
6
- metadata.gz: f3f515dfcdf6eef038ca6407c8fe018f81f6a9a460895e71fcfb09baaf14b40d7c152ae7fa5488062b8c5cb8fcc47053e29acd0c51a4d61168707b9f542e6409
7
- data.tar.gz: d33b4cafc4efc36a99add35aba603d88c587998b6271ee73bc9bdb18be3fd4059467401b8f2014e0e1853c191e217dd9f8bb4653a48b3732f3833b74a1ba9a72
6
+ metadata.gz: 89748084b9a82a691a687e8125606084b357302d194d66db6c46be8fb0495b7a811782efb8d8a6d2bf114a497db8bc737196550b534043ac0ee35aa30e229dc4
7
+ data.tar.gz: cc373441d0b074b097295d8008b8abfb9edb1ba64036335d112fb50dc72983b6b788204a9194271c46ce4cbad2007f07cd0c77a5f5c3118cd351210d8b2f50b3
data/README.md CHANGED
@@ -31,3 +31,9 @@ rails g foundation:install
31
31
  3. Commit your changes (`git commit -am 'Add some feature'`)
32
32
  4. Push to the branch (`git push origin my-new-feature`)
33
33
  5. Create new Pull Request
34
+
35
+ ## Resources
36
+
37
+ * [Foundation Docs](http://foundation.zurb.com/docs/)
38
+ * [Foundation Forum](http://foundation.zurb.com/forum)
39
+ * [Foundation Training](http://foundation.zurb.com/learn/training.html)
data/bower.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "foundation-rails",
3
- "version": "5.1.0.0",
3
+ "version": "5.1.1.0",
4
4
  "dependencies": {
5
- "foundation": "5.1.0"
5
+ "foundation": "5.1.1"
6
6
  }
7
7
  }
@@ -2,6 +2,9 @@ module Foundation
2
2
  module Rails
3
3
  class Engine < ::Rails::Engine
4
4
  isolate_namespace Foundation::Rails
5
+ initializer "foundation-rails.assets.precompile" do |app|
6
+ app.config.assets.precompile += %w( vendor/modernizr.js )
7
+ end
5
8
  end
6
9
  end
7
- end
10
+ end
@@ -2,17 +2,17 @@
2
2
  %html{ :lang => "en"}
3
3
  %head
4
4
  %meta{ :charset => "utf-8" }
5
-
5
+
6
6
  %meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0" }
7
7
 
8
8
  %title= content_for?(:title) ? yield(:title) : "Untitled"
9
9
 
10
10
  = stylesheet_link_tag "application"
11
- = javascript_include_tag "vendor/custom.modernizr"
11
+ = javascript_include_tag "vendor/modernizr"
12
12
  = csrf_meta_tag
13
13
 
14
14
  %body
15
15
 
16
16
  = yield
17
17
 
18
- = javascript_include_tag "application"
18
+ = javascript_include_tag "application"
@@ -4,7 +4,7 @@ html lang="en"
4
4
  meta charset="utf-8"
5
5
  meta name="viewport" content="width=device-width, initial-scale=1.0"
6
6
 
7
- title == content_for?(:title) ? yield(:title) : "Untitled"
7
+ title == content_for?(:title) ? yield(:title) : "Untitled"
8
8
 
9
9
  = stylesheet_link_tag "application"
10
10
  = javascript_include_tag "vendor/modernizr"
@@ -1,5 +1,5 @@
1
1
  module Foundation
2
2
  module Rails
3
- VERSION = "5.1.0.1"
3
+ VERSION = "5.1.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.1.0',
7
+ version : '5.1.1',
8
8
 
9
9
  settings : {
10
10
  live_validate : true,
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.accordion = {
5
5
  name : 'accordion',
6
6
 
7
- version : '5.1.0',
7
+ version : '5.1.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.1.0',
7
+ version : '5.1.1',
8
8
 
9
9
  settings : {
10
10
  animation: 'fadeOut',
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.clearing = {
5
5
  name : 'clearing',
6
6
 
7
- version: '5.1.0',
7
+ version: '5.1.1',
8
8
 
9
9
  settings : {
10
10
  templates : {
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.dropdown = {
5
5
  name : 'dropdown',
6
6
 
7
- version : '5.1.0',
7
+ version : '5.1.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.1.0',
7
+ version : '5.1.1',
8
8
 
9
9
  settings : {
10
10
  use_tallest: true,
@@ -14,6 +14,7 @@
14
14
 
15
15
  init : function (scope, method, options) {
16
16
  this.bindings(method, options);
17
+ this.reflow();
17
18
  },
18
19
 
19
20
  events : function () {
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.interchange = {
5
5
  name : 'interchange',
6
6
 
7
- version : '5.1.0',
7
+ version : '5.1.1',
8
8
 
9
9
  cache : {},
10
10
 
@@ -6,7 +6,7 @@
6
6
  Foundation.libs.joyride = {
7
7
  name : 'joyride',
8
8
 
9
- version : '5.1.0',
9
+ version : '5.1.1',
10
10
 
11
11
  defaults : {
12
12
  expose : false, // turn on or off the expose feature
@@ -279,7 +279,7 @@
279
279
  window.Foundation = {
280
280
  name : 'Foundation',
281
281
 
282
- version : '5.1.0',
282
+ version : '5.1.1',
283
283
 
284
284
  media_queries : {
285
285
  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.1.0',
7
+ version : '5.1.1',
8
8
 
9
9
  settings : {
10
10
  active_class: 'active',
@@ -29,9 +29,9 @@
29
29
 
30
30
  S(self.scope)
31
31
  .off('.magellan')
32
- .on('click.fndtn.magellan', '[data-magellan-arrival] a[href^="#"]', function (e) {
32
+ .on('click.fndtn.magellan', '[' + self.add_namespace('data-magellan-arrival') + '] a[href^="#"]', function (e) {
33
33
  e.preventDefault();
34
- var expedition = $(this).closest('[data-magellan-expedition]'),
34
+ var expedition = $(this).closest('[' + self.attr_name() + ']'),
35
35
  settings = expedition.data('magellan-expedition-init');
36
36
 
37
37
  var hash = this.hash.split('#').join(''),
@@ -86,16 +86,16 @@
86
86
  if (window_top_offset >= top_offset) {
87
87
  // Placeholder allows height calculations to be consistent even when
88
88
  // appearing to switch between fixed/non-fixed placement
89
- var placeholder = expedition.prev('[data-magellan-expedition-clone]');
89
+ var placeholder = expedition.prev('[' + self.add_namespace('data-magellan-expedition-clone') + ']');
90
90
  if (placeholder.length === 0) {
91
91
  placeholder = expedition.clone();
92
- placeholder.removeAttr('data-magellan-expedition');
93
- placeholder.attr('data-magellan-expedition-clone','');
92
+ placeholder.removeAttr(self.attr_name());
93
+ placeholder.attr(self.add_namespace('data-magellan-expedition-clone'),'');
94
94
  expedition.before(placeholder);
95
95
  }
96
96
  expedition.css({position:'fixed', top: 0});
97
97
  } else {
98
- expedition.prev('[data-magellan-expedition-clone]').remove();
98
+ expedition.prev('[' + self.add_namespace('data-magellan-expedition-clone') + ']').remove();
99
99
  expedition.attr('style','');
100
100
  }
101
101
  });
@@ -165,7 +165,7 @@
165
165
  reflow : function () {
166
166
  var self = this;
167
167
  // remove placeholder expeditions used for height calculation purposes
168
- $('[data-magellan-expedition-clone]', self.scope).remove();
168
+ $('[' + self.add_namespace('data-magellan-expedition-clone') + ']', self.scope).remove();
169
169
  }
170
170
  };
171
171
  }(jQuery, this, this.document));
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.offcanvas = {
5
5
  name : 'offcanvas',
6
6
 
7
- version : '5.1.0',
7
+ version : '5.1.1',
8
8
 
9
9
  settings : {},
10
10
 
@@ -396,7 +396,7 @@
396
396
  Foundation.libs.orbit = {
397
397
  name: 'orbit',
398
398
 
399
- version: '5.1.0',
399
+ version: '5.1.1',
400
400
 
401
401
  settings: {
402
402
  animation: 'slide',
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.reveal = {
5
5
  name : 'reveal',
6
6
 
7
- version : '5.1.0',
7
+ version : '5.1.1',
8
8
 
9
9
  locked : false,
10
10
 
@@ -5,7 +5,7 @@
5
5
  Foundation.libs.tab = {
6
6
  name : 'tab',
7
7
 
8
- version : '5.1.0',
8
+ version : '5.1.1',
9
9
 
10
10
  settings : {
11
11
  active_class: 'active',
@@ -4,7 +4,7 @@
4
4
  Foundation.libs.tooltip = {
5
5
  name : 'tooltip',
6
6
 
7
- version : '5.1.0',
7
+ version : '5.1.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.1.0',
7
+ version: '5.1.1',
8
8
 
9
9
  settings : {
10
10
  index : 0,
@@ -54,24 +54,24 @@ $modules: () !default;
54
54
  }
55
55
 
56
56
  // REM CALC
57
- /*
58
- New Syntax, allows to optionally calculate on a different base value to counter compounding effect of rem's.
59
- Call with 1, 2, 3 or 4 parameters, 'px' is not required but supported:
60
57
 
61
- rem-calc(10 20 30px 40);
58
+ // New Syntax, allows to optionally calculate on a different base value to counter compounding effect of rem's.
59
+ // Call with 1, 2, 3 or 4 parameters, 'px' is not required but supported:
60
+ //
61
+ // rem-calc(10 20 30px 40);
62
+ //
63
+ // Space delimited, if you want to delimit using comma's, wrap it in another pair of brackets
64
+ //
65
+ // rem-calc((10, 20, 30, 40px));
66
+ //
67
+ // Optionally call with a different base (eg: 8px) to calculate rem.
68
+ //
69
+ // rem-calc(16px 32px 48px, 8px);
70
+ //
71
+ // If you require to comma separate your list
72
+ //
73
+ // rem-calc((16px, 32px, 48), 8px);
62
74
 
63
- Space delimited, if you want to delimit using comma's, wrap it in another pair of brackets
64
-
65
- rem-calc((10, 20, 30, 40px));
66
-
67
- Optionally call with a different base (eg: 8px) to calculate rem.
68
-
69
- rem-calc(16px 32px 48px, 8px);
70
-
71
- If you require to comma separate your list
72
-
73
- rem-calc((16px, 32px, 48), 8px);
74
- */
75
75
  @function rem-calc($values, $base-value: $rem-base) {
76
76
  $max: length($values);
77
77
 
@@ -490,7 +490,7 @@
490
490
  // $input-focus-border-color: scale-color(#fff, $lightness: -40%);
491
491
  // $input-border-style: solid;
492
492
  // $input-border-width: 1px;
493
- // $input-border-radius: 0;
493
+ // $input-border-radius: $global-radius;
494
494
  // $input-disabled-bg: #ddd;
495
495
  // $input-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
496
496
  // $input-include-glowing-effect: true;
@@ -20,6 +20,7 @@ $button-group-border-width: 1px !default;
20
20
  @if $styles {
21
21
  list-style: none;
22
22
  margin: 0;
23
+ #{$default-float}: 0;
23
24
  @include clearfix();
24
25
  }
25
26
  @if $float {
@@ -32,14 +33,14 @@ $button-group-border-width: 1px !default;
32
33
  // We use this to control styles for button groups
33
34
  @mixin button-group-style($radius:false, $even:false, $float:$default-float) {
34
35
 
35
- > button, .button {
36
- border-#{$opposite-direction}: $button-group-border-width solid;
37
- border-color: rgba(255, 255, 255, 0.5);
36
+ > button, .button {
37
+ border-#{$default-float}: $button-group-border-width solid;
38
+ border-color: rgba(255, 255, 255, 0.5);
38
39
  }
39
40
 
40
- &:last-child {
41
+ &:first-child {
41
42
  button, .button {
42
- border-#{$opposite-direction}: 0;
43
+ border-#{$default-float}: 0;
43
44
  }
44
45
  }
45
46
 
@@ -85,7 +86,7 @@ $button-group-border-width: 1px !default;
85
86
  @if $include-html-button-classes {
86
87
  .button-group { @include button-group-container;
87
88
 
88
- &> * { @include button-group-style(); }
89
+ li { @include button-group-style(); }
89
90
 
90
91
  &.radius > * { @include button-group-style($radius:$button-radius, $float:null); }
91
92
  &.round > * { @include button-group-style($radius:$button-round, $float:null); }
@@ -25,7 +25,7 @@ $input-border-color: scale-color(#fff, $lightness: -20%) !default;
25
25
  $input-focus-border-color: scale-color(#fff, $lightness: -40%) !default;
26
26
  $input-border-style: solid !default;
27
27
  $input-border-width: 1px !default;
28
- $input-border-radius: 0 !default;
28
+ $input-border-radius: $global-radius !default;
29
29
  $input-disabled-bg: #ddd !default;
30
30
  $input-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1) !default;
31
31
  $input-include-glowing-effect: true !default;
@@ -347,7 +347,7 @@ $select-bg-color: #fafafa !default;
347
347
  select::-ms-expand {
348
348
  display:none;
349
349
  }
350
-
350
+
351
351
  @-moz-document url-prefix() {
352
352
  select { background: $select-bg-color; }
353
353
  select:hover { background: scale-color($select-bg-color, $lightness: -3%); }
@@ -389,14 +389,15 @@ $select-bg-color: #fafafa !default;
389
389
  input[type="url"],
390
390
  textarea {
391
391
  -webkit-appearance: none;
392
- -webkit-border-radius: $input-border-radius;
393
- border-radius: $input-border-radius;
394
392
  @include form-element;
395
393
  @if not $input-include-glowing-effect {
396
394
  @include single-transition(all, 0.15s, linear);
397
395
  }
396
+ &.radius {
397
+ @include radius($input-border-radius);
398
+ }
398
399
  }
399
-
400
+
400
401
  /* Add height value for select elements to match text input height */
401
402
  select {
402
403
  height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
@@ -7,10 +7,6 @@
7
7
  // styles get applied to [data-mysite-plugin], etc
8
8
  $namespace: false !default;
9
9
 
10
- meta.foundation-data-attribute-namespace {
11
- font-family: #{$namespace};
12
- }
13
-
14
10
  $experimental: true !default;
15
11
 
16
12
  // The default font-size is set to 100% of the browser style sheet (usually 16px)
@@ -24,9 +20,6 @@ $base-font-size: 100% !default;
24
20
  // $base-line-height is 24px while $base-font-size is 16px
25
21
  $base-line-height: 150% !default;
26
22
 
27
- // Must be 100% for off cavas to work
28
- html, body { height: 100%; }
29
-
30
23
  //
31
24
  // Global Foundation Mixins
32
25
  //
@@ -293,6 +286,13 @@ $cursor-text-value: text !default;
293
286
  width: lower-bound($xxlarge-range);
294
287
  }
295
288
 
289
+ meta.foundation-data-attribute-namespace {
290
+ font-family: #{$namespace};
291
+ }
292
+
293
+ // Must be 100% for off canvas to work
294
+ html, body { height: 100%; }
295
+
296
296
  @if $include-html-global-classes {
297
297
 
298
298
  // Set box-sizing globally to handle padding and border widths
@@ -114,7 +114,7 @@ $menu-slide: "transform 500ms ease" !default;
114
114
  @include kill-flicker;
115
115
  @include wrap-base;
116
116
  @include clearfix;
117
-
117
+
118
118
  -webkit-transition: -webkit-#{$menu-slide};
119
119
  -moz-transition: -moz-#{$menu-slide};
120
120
  -ms-transition: -ms-#{$menu-slide};
@@ -256,13 +256,14 @@ $menu-slide: "transform 500ms ease" !default;
256
256
  @include kill-flicker;
257
257
  @include off-canvas-menu;
258
258
  @include translate3d(-100%,0,0);
259
+ left: 0;
259
260
  * { @include kill-flicker; }
260
261
  }
261
262
  @mixin right-off-canvas-menu {
262
263
  @include kill-flicker;
263
264
  @include off-canvas-menu;
264
265
  @include translate3d(100%,0,0);
265
- right:0;
266
+ right: 0;
266
267
  }
267
268
 
268
269
 
@@ -39,8 +39,10 @@ $topbar-link-bg-hover: #272727 !default;
39
39
  $topbar-link-bg-active: $primary-color !default;
40
40
  $topbar-link-bg-active-hover: scale-color($primary-color, $lightness: -14%) !default;
41
41
  $topbar-link-font-family: $body-font-family !default;
42
+ $topbar-link-padding: $topbar-height / 3 !default;
42
43
 
43
44
  $topbar-button-font-size: 0.75rem;
45
+ $topbar-button-top: 7px !default;
44
46
 
45
47
  $topbar-dropdown-label-color: #777 !default;
46
48
  $topbar-dropdown-label-text-transform: uppercase !default;
@@ -168,7 +170,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
168
170
  color: $topbar-link-color;
169
171
  width: 50%;
170
172
  display: block;
171
- padding: 0 $topbar-height / 3;
173
+ padding: 0 $topbar-link-padding;
172
174
  }
173
175
  }
174
176
  }
@@ -186,14 +188,14 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
186
188
  font-weight: $topbar-menu-link-weight;
187
189
  position: relative;
188
190
  display: block;
189
- padding: 0 $topbar-height / 3;
191
+ padding: 0 $topbar-link-padding;
190
192
  height: $topbar-height;
191
193
  line-height: $topbar-height;
192
194
  }
193
195
 
194
196
  // Adding the class "menu-icon" will add the 3-line icon people love and adore.
195
197
  &.menu-icon {
196
- #{$opposite-direction}: $topbar-height / 3;
198
+ #{$opposite-direction}: $topbar-link-padding;
197
199
  top: 50%;
198
200
  margin-top: -16px;
199
201
  padding-#{$default-float}: 40px;
@@ -289,7 +291,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
289
291
  width: 100%;
290
292
  color: $topbar-link-color;
291
293
  padding: 12px 0 12px 0;
292
- padding-#{$default-float}: $topbar-height / 3;
294
+ padding-#{$default-float}: $topbar-link-padding;
293
295
  font-family: $topbar-link-font-family;
294
296
  font-size: $topbar-link-font-size;
295
297
  font-weight: $topbar-link-weight;
@@ -298,8 +300,8 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
298
300
  &.button {
299
301
  background: $primary-color;
300
302
  font-size: $topbar-link-font-size;
301
- padding-#{$opposite-direction}: $topbar-height / 3;
302
- padding-#{$default-float}: $topbar-height / 3;
303
+ padding-#{$opposite-direction}: $topbar-link-padding;
304
+ padding-#{$default-float}: $topbar-link-padding;
303
305
  &:hover {
304
306
  background: scale-color($primary-color, $lightness: -27%);
305
307
  }
@@ -344,7 +346,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
344
346
  }
345
347
 
346
348
  // Add some extra padding for list items contains buttons
347
- .has-form { padding: $topbar-height / 3; }
349
+ .has-form { padding: $topbar-link-padding; }
348
350
 
349
351
  // Styling for list items that have a dropdown within them.
350
352
  .has-dropdown {
@@ -355,7 +357,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
355
357
  @if ($topbar-arrows){
356
358
  @include css-triangle($topbar-dropdown-toggle-size, rgba($topbar-dropdown-toggle-color, $topbar-dropdown-toggle-alpha), $default-float);
357
359
  }
358
- margin-#{$opposite-direction}: $topbar-height / 3;
360
+ margin-#{$opposite-direction}: $topbar-link-padding;
359
361
  margin-top: -($topbar-dropdown-toggle-size / 2) - 2;
360
362
  position: absolute;
361
363
  top: 50%;
@@ -384,7 +386,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
384
386
 
385
387
  a {
386
388
  font-weight: $topbar-dropdown-link-weight;
387
- padding: 8px $topbar-height / 3;
389
+ padding: 8px $topbar-link-padding;
388
390
  &.parent-link {
389
391
  font-weight: $topbar-link-weight;
390
392
  }
@@ -397,12 +399,12 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
397
399
  display: block;
398
400
  }
399
401
  }
400
- &.has-form { padding: 8px $topbar-height / 3; }
402
+ &.has-form { padding: 8px $topbar-link-padding; }
401
403
  .button { top: auto; }
402
404
  }
403
405
 
404
406
  label {
405
- padding: 8px $topbar-height / 3 2px;
407
+ padding: 8px $topbar-link-padding 2px;
406
408
  margin-bottom: 0;
407
409
  text-transform: $topbar-dropdown-label-text-transform;
408
410
  color: $topbar-dropdown-label-color;
@@ -431,7 +433,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
431
433
  .button {
432
434
  font-size: rem-calc(14);
433
435
  position: relative;
434
- top: 7px;
436
+ top: $topbar-button-top;
435
437
  }
436
438
 
437
439
  &.expanded { background: $topbar-bg; }
@@ -467,7 +469,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
467
469
  }
468
470
  &:not(.has-form) {
469
471
  a:not(.button) {
470
- padding: 0 $topbar-height / 3;
472
+ padding: 0 $topbar-link-padding;
471
473
  line-height: $topbar-height;
472
474
  background: $topbar-bg;
473
475
  &:hover { background: $topbar-link-bg-hover; }
@@ -489,7 +491,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
489
491
  @if($topbar-arrows){
490
492
 
491
493
  & > a {
492
- padding-#{$opposite-direction}: $topbar-height / 3 + 20 !important;
494
+ padding-#{$opposite-direction}: $topbar-link-padding + 20 !important;
493
495
  &:after {
494
496
  @include css-triangle($topbar-dropdown-toggle-size, rgba($topbar-dropdown-toggle-color, $topbar-dropdown-toggle-alpha), top);
495
497
  margin-top: -($topbar-dropdown-toggle-size / 2);
@@ -535,7 +537,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
535
537
  color: $topbar-dropdown-link-color;
536
538
  line-height: 1;
537
539
  white-space: nowrap;
538
- padding: 12px $topbar-height / 3;
540
+ padding: 12px $topbar-link-padding;
539
541
  background: $topbar-dropdown-link-bg;
540
542
  }
541
543
 
@@ -564,7 +566,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
564
566
 
565
567
  .has-form {
566
568
  background: $topbar-bg;
567
- padding: 0 $topbar-height / 3;
569
+ padding: 0 $topbar-link-padding;
568
570
  height: $topbar-height;
569
571
  }
570
572
 
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.1.0.1
4
+ version: 5.1.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-02-06 00:00:00.000000000 Z
11
+ date: 2014-02-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler