Permalink
Browse files

bump to 5.1.1.0

  • Loading branch information...
1 parent 7f4cde6 commit 1413e8c844bdad8bd9fab279dfe44b0d670821c7 @mhayes mhayes committed Feb 7, 2014
Showing with 85 additions and 79 deletions.
  1. +2 −2 bower.json
  2. +1 −1 lib/foundation/rails/version.rb
  3. +1 −1 vendor/assets/javascripts/foundation/foundation.abide.js
  4. +1 −1 vendor/assets/javascripts/foundation/foundation.accordion.js
  5. +1 −1 vendor/assets/javascripts/foundation/foundation.alert.js
  6. +1 −1 vendor/assets/javascripts/foundation/foundation.clearing.js
  7. +1 −1 vendor/assets/javascripts/foundation/foundation.dropdown.js
  8. +2 −1 vendor/assets/javascripts/foundation/foundation.equalizer.js
  9. +1 −1 vendor/assets/javascripts/foundation/foundation.interchange.js
  10. +1 −1 vendor/assets/javascripts/foundation/foundation.joyride.js
  11. +1 −1 vendor/assets/javascripts/foundation/foundation.js
  12. +8 −8 vendor/assets/javascripts/foundation/foundation.magellan.js
  13. +1 −1 vendor/assets/javascripts/foundation/foundation.offcanvas.js
  14. +1 −1 vendor/assets/javascripts/foundation/foundation.orbit.js
  15. +1 −1 vendor/assets/javascripts/foundation/foundation.reveal.js
  16. +1 −1 vendor/assets/javascripts/foundation/foundation.tab.js
  17. +1 −1 vendor/assets/javascripts/foundation/foundation.tooltip.js
  18. +1 −1 vendor/assets/javascripts/foundation/foundation.topbar.js
  19. +16 −16 vendor/assets/stylesheets/foundation/_functions.scss
  20. +1 −1 vendor/assets/stylesheets/foundation/_settings.scss
  21. +7 −6 vendor/assets/stylesheets/foundation/components/_button-groups.scss
  22. +6 −5 vendor/assets/stylesheets/foundation/components/_forms.scss
  23. +7 −7 vendor/assets/stylesheets/foundation/components/_global.scss
  24. +3 −2 vendor/assets/stylesheets/foundation/components/_offcanvas.scss
  25. +18 −16 vendor/assets/stylesheets/foundation/components/_top-bar.scss
View
@@ -1,7 +1,7 @@
{
"name": "foundation-rails",
- "version": "5.1.0.0",
+ "version": "5.1.1.0",
"dependencies": {
- "foundation": "5.1.0"
+ "foundation": "5.1.1"
}
}
@@ -1,5 +1,5 @@
module Foundation
module Rails
- VERSION = "5.1.0.1"
+ VERSION = "5.1.1.0"
end
end
@@ -4,7 +4,7 @@
Foundation.libs.abide = {
name : 'abide',
- version : '5.1.0',
+ version : '5.1.1',
settings : {
live_validate : true,
@@ -4,7 +4,7 @@
Foundation.libs.accordion = {
name : 'accordion',
- version : '5.1.0',
+ version : '5.1.1',
settings : {
active_class: 'active',
@@ -4,7 +4,7 @@
Foundation.libs.alert = {
name : 'alert',
- version : '5.1.0',
+ version : '5.1.1',
settings : {
animation: 'fadeOut',
@@ -4,7 +4,7 @@
Foundation.libs.clearing = {
name : 'clearing',
- version: '5.1.0',
+ version: '5.1.1',
settings : {
templates : {
@@ -4,7 +4,7 @@
Foundation.libs.dropdown = {
name : 'dropdown',
- version : '5.1.0',
+ version : '5.1.1',
settings : {
active_class: 'open',
@@ -4,7 +4,7 @@
Foundation.libs.equalizer = {
name : 'equalizer',
- version : '5.1.0',
+ version : '5.1.1',
settings : {
use_tallest: true,
@@ -14,6 +14,7 @@
init : function (scope, method, options) {
this.bindings(method, options);
+ this.reflow();
},
events : function () {
@@ -4,7 +4,7 @@
Foundation.libs.interchange = {
name : 'interchange',
- version : '5.1.0',
+ version : '5.1.1',
cache : {},
@@ -6,7 +6,7 @@
Foundation.libs.joyride = {
name : 'joyride',
- version : '5.1.0',
+ version : '5.1.1',
defaults : {
expose : false, // turn on or off the expose feature
@@ -279,7 +279,7 @@
window.Foundation = {
name : 'Foundation',
- version : '5.1.0',
+ version : '5.1.1',
media_queries : {
small : S('.foundation-mq-small').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''),
@@ -4,7 +4,7 @@
Foundation.libs['magellan-expedition'] = {
name : 'magellan-expedition',
- version : '5.1.0',
+ version : '5.1.1',
settings : {
active_class: 'active',
@@ -29,9 +29,9 @@
S(self.scope)
.off('.magellan')
- .on('click.fndtn.magellan', '[data-magellan-arrival] a[href^="#"]', function (e) {
+ .on('click.fndtn.magellan', '[' + self.add_namespace('data-magellan-arrival') + '] a[href^="#"]', function (e) {
e.preventDefault();
- var expedition = $(this).closest('[data-magellan-expedition]'),
+ var expedition = $(this).closest('[' + self.attr_name() + ']'),
settings = expedition.data('magellan-expedition-init');
var hash = this.hash.split('#').join(''),
@@ -86,16 +86,16 @@
if (window_top_offset >= top_offset) {
// Placeholder allows height calculations to be consistent even when
// appearing to switch between fixed/non-fixed placement
- var placeholder = expedition.prev('[data-magellan-expedition-clone]');
+ var placeholder = expedition.prev('[' + self.add_namespace('data-magellan-expedition-clone') + ']');
if (placeholder.length === 0) {
placeholder = expedition.clone();
- placeholder.removeAttr('data-magellan-expedition');
- placeholder.attr('data-magellan-expedition-clone','');
+ placeholder.removeAttr(self.attr_name());
+ placeholder.attr(self.add_namespace('data-magellan-expedition-clone'),'');
expedition.before(placeholder);
}
expedition.css({position:'fixed', top: 0});
} else {
- expedition.prev('[data-magellan-expedition-clone]').remove();
+ expedition.prev('[' + self.add_namespace('data-magellan-expedition-clone') + ']').remove();
expedition.attr('style','');
}
});
@@ -165,7 +165,7 @@
reflow : function () {
var self = this;
// remove placeholder expeditions used for height calculation purposes
- $('[data-magellan-expedition-clone]', self.scope).remove();
+ $('[' + self.add_namespace('data-magellan-expedition-clone') + ']', self.scope).remove();
}
};
}(jQuery, this, this.document));
@@ -4,7 +4,7 @@
Foundation.libs.offcanvas = {
name : 'offcanvas',
- version : '5.1.0',
+ version : '5.1.1',
settings : {},
@@ -396,7 +396,7 @@
Foundation.libs.orbit = {
name: 'orbit',
- version: '5.1.0',
+ version: '5.1.1',
settings: {
animation: 'slide',
@@ -4,7 +4,7 @@
Foundation.libs.reveal = {
name : 'reveal',
- version : '5.1.0',
+ version : '5.1.1',
locked : false,
@@ -5,7 +5,7 @@
Foundation.libs.tab = {
name : 'tab',
- version : '5.1.0',
+ version : '5.1.1',
settings : {
active_class: 'active',
@@ -4,7 +4,7 @@
Foundation.libs.tooltip = {
name : 'tooltip',
- version : '5.1.0',
+ version : '5.1.1',
settings : {
additional_inheritable_classes : [],
@@ -4,7 +4,7 @@
Foundation.libs.topbar = {
name : 'topbar',
- version: '5.1.0',
+ version: '5.1.1',
settings : {
index : 0,
@@ -54,24 +54,24 @@ $modules: () !default;
}
// REM CALC
-/*
-New Syntax, allows to optionally calculate on a different base value to counter compounding effect of rem's.
-Call with 1, 2, 3 or 4 parameters, 'px' is not required but supported:
- rem-calc(10 20 30px 40);
+// New Syntax, allows to optionally calculate on a different base value to counter compounding effect of rem's.
+// Call with 1, 2, 3 or 4 parameters, 'px' is not required but supported:
+//
+// rem-calc(10 20 30px 40);
+//
+// Space delimited, if you want to delimit using comma's, wrap it in another pair of brackets
+//
+// rem-calc((10, 20, 30, 40px));
+//
+// Optionally call with a different base (eg: 8px) to calculate rem.
+//
+// rem-calc(16px 32px 48px, 8px);
+//
+// If you require to comma separate your list
+//
+// rem-calc((16px, 32px, 48), 8px);
-Space delimited, if you want to delimit using comma's, wrap it in another pair of brackets
-
- rem-calc((10, 20, 30, 40px));
-
-Optionally call with a different base (eg: 8px) to calculate rem.
-
- rem-calc(16px 32px 48px, 8px);
-
-If you require to comma separate your list
-
- rem-calc((16px, 32px, 48), 8px);
-*/
@function rem-calc($values, $base-value: $rem-base) {
$max: length($values);
@@ -490,7 +490,7 @@
// $input-focus-border-color: scale-color(#fff, $lightness: -40%);
// $input-border-style: solid;
// $input-border-width: 1px;
-// $input-border-radius: 0;
+// $input-border-radius: $global-radius;
// $input-disabled-bg: #ddd;
// $input-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
// $input-include-glowing-effect: true;
@@ -20,6 +20,7 @@ $button-group-border-width: 1px !default;
@if $styles {
list-style: none;
margin: 0;
+ #{$default-float}: 0;
@include clearfix();
}
@if $float {
@@ -32,14 +33,14 @@ $button-group-border-width: 1px !default;
// We use this to control styles for button groups
@mixin button-group-style($radius:false, $even:false, $float:$default-float) {
- > button, .button {
- border-#{$opposite-direction}: $button-group-border-width solid;
- border-color: rgba(255, 255, 255, 0.5);
+ > button, .button {
+ border-#{$default-float}: $button-group-border-width solid;
+ border-color: rgba(255, 255, 255, 0.5);
}
- &:last-child {
+ &:first-child {
button, .button {
- border-#{$opposite-direction}: 0;
+ border-#{$default-float}: 0;
}
}
@@ -85,7 +86,7 @@ $button-group-border-width: 1px !default;
@if $include-html-button-classes {
.button-group { @include button-group-container;
- &> * { @include button-group-style(); }
+ li { @include button-group-style(); }
&.radius > * { @include button-group-style($radius:$button-radius, $float:null); }
&.round > * { @include button-group-style($radius:$button-round, $float:null); }
@@ -25,7 +25,7 @@ $input-border-color: scale-color(#fff, $lightness: -20%) !default;
$input-focus-border-color: scale-color(#fff, $lightness: -40%) !default;
$input-border-style: solid !default;
$input-border-width: 1px !default;
-$input-border-radius: 0 !default;
+$input-border-radius: $global-radius !default;
$input-disabled-bg: #ddd !default;
$input-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1) !default;
$input-include-glowing-effect: true !default;
@@ -347,7 +347,7 @@ $select-bg-color: #fafafa !default;
select::-ms-expand {
display:none;
}
-
+
@-moz-document url-prefix() {
select { background: $select-bg-color; }
select:hover { background: scale-color($select-bg-color, $lightness: -3%); }
@@ -389,14 +389,15 @@ $select-bg-color: #fafafa !default;
input[type="url"],
textarea {
-webkit-appearance: none;
- -webkit-border-radius: $input-border-radius;
- border-radius: $input-border-radius;
@include form-element;
@if not $input-include-glowing-effect {
@include single-transition(all, 0.15s, linear);
}
+ &.radius {
+ @include radius($input-border-radius);
+ }
}
-
+
/* Add height value for select elements to match text input height */
select {
height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
@@ -7,10 +7,6 @@
// styles get applied to [data-mysite-plugin], etc
$namespace: false !default;
-meta.foundation-data-attribute-namespace {
- font-family: #{$namespace};
-}
-
$experimental: true !default;
// The default font-size is set to 100% of the browser style sheet (usually 16px)
@@ -24,9 +20,6 @@ $base-font-size: 100% !default;
// $base-line-height is 24px while $base-font-size is 16px
$base-line-height: 150% !default;
-// Must be 100% for off cavas to work
-html, body { height: 100%; }
-
//
// Global Foundation Mixins
//
@@ -293,6 +286,13 @@ $cursor-text-value: text !default;
width: lower-bound($xxlarge-range);
}
+ meta.foundation-data-attribute-namespace {
+ font-family: #{$namespace};
+ }
+
+ // Must be 100% for off canvas to work
+ html, body { height: 100%; }
+
@if $include-html-global-classes {
// Set box-sizing globally to handle padding and border widths
@@ -114,7 +114,7 @@ $menu-slide: "transform 500ms ease" !default;
@include kill-flicker;
@include wrap-base;
@include clearfix;
-
+
-webkit-transition: -webkit-#{$menu-slide};
-moz-transition: -moz-#{$menu-slide};
-ms-transition: -ms-#{$menu-slide};
@@ -256,13 +256,14 @@ $menu-slide: "transform 500ms ease" !default;
@include kill-flicker;
@include off-canvas-menu;
@include translate3d(-100%,0,0);
+ left: 0;
* { @include kill-flicker; }
}
@mixin right-off-canvas-menu {
@include kill-flicker;
@include off-canvas-menu;
@include translate3d(100%,0,0);
- right:0;
+ right: 0;
}
Oops, something went wrong.

0 comments on commit 1413e8c

Please sign in to comment.