Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update Foundation to 3.2.5

  • Loading branch information...
commit 6ea55843ebde060368a9a884a51160755c88e738 1 parent 8f07c31
@ryanwachtl authored
View
18 css/app.css
@@ -624,12 +624,12 @@ ul.flyout li.active a, .nav-bar li ul li.active a { background: #4d4d4d; border:
/* Note: If your slider only uses content or anchors, you're going to want to put the width and height declarations on the ".orbit>div" and "div.orbit>a" tags in addition to just the .orbit-wrapper */
/* Timer ---------------------- */
.orbit-wrapper .timer { width: 40px; height: 40px; overflow: hidden; position: absolute; top: 10px; right: 10px; opacity: .6; cursor: pointer; z-index: 31; }
-.orbit-wrapper span.rotator { display: block; width: 40px; height: 40px; position: absolute; top: 0; left: -20px; background: url('../images/foundation/orbit/rotator-black.png?1358223220') no-repeat; z-index: 3; }
+.orbit-wrapper span.rotator { display: block; width: 40px; height: 40px; position: absolute; top: 0; left: -20px; background: url('../images/foundation/orbit/rotator-black.png?1359516974') no-repeat; z-index: 3; }
.orbit-wrapper span.rotator.move { left: 0; }
.orbit-wrapper span.mask { display: block; width: 20px; height: 40px; position: absolute; top: 0; right: 0; z-index: 2; overflow: hidden; }
-.orbit-wrapper span.mask.move { width: 40px; left: 0; background: url('../images/foundation/orbit/timer-black.png?1358223220') repeat 0 0; }
-.orbit-wrapper span.pause { display: block; width: 40px; height: 40px; position: absolute; top: 0; left: 0; background: url('../images/foundation/orbit/pause-black.png?1358223220') no-repeat; z-index: 4; opacity: 0; }
-.orbit-wrapper span.pause.active { background: url('../images/foundation/orbit/pause-black.png?1358223220') no-repeat 0 -40px; }
+.orbit-wrapper span.mask.move { width: 40px; left: 0; background: url('../images/foundation/orbit/timer-black.png?1359516974') repeat 0 0; }
+.orbit-wrapper span.pause { display: block; width: 40px; height: 40px; position: absolute; top: 0; left: 0; background: url('../images/foundation/orbit/pause-black.png?1359516974') no-repeat; z-index: 4; opacity: 0; }
+.orbit-wrapper span.pause.active { background: url('../images/foundation/orbit/pause-black.png?1359516974') no-repeat 0 -40px; }
.orbit-wrapper .timer:hover span.pause, .orbit-wrapper .timer:focus span.pause, .orbit-wrapper span.pause.active { opacity: 1; }
/* Captions ---------------------- */
@@ -640,15 +640,15 @@ ul.flyout li.active a, .nav-bar li ul li.active a { background: #4d4d4d; border:
/* Directional Nav ---------------------- */
.orbit-wrapper .slider-nav { display: block; }
.orbit-wrapper .slider-nav span { width: 39px; height: 50px; text-indent: -9999px; position: absolute; z-index: 30; top: 50%; margin-top: -25px; cursor: pointer; }
-.orbit-wrapper .slider-nav span.right { background: url('../images/foundation/orbit/right-arrow.png?1358223220'); background-size: 100%; right: 0; }
-.orbit-wrapper .slider-nav span.left { background: url('../images/foundation/orbit/left-arrow.png?1358223220'); background-size: 100%; left: 0; }
+.orbit-wrapper .slider-nav span.right { background: url('../images/foundation/orbit/right-arrow.png?1359516974'); background-size: 100%; right: 0; }
+.orbit-wrapper .slider-nav span.left { background: url('../images/foundation/orbit/left-arrow.png?1359516974'); background-size: 100%; left: 0; }
-.lt-ie9 .orbit-wrapper .slider-nav span.right { background: url('../images/foundation/orbit/right-arrow-small.png?1358223220'); }
-.lt-ie9 .orbit-wrapper .slider-nav span.left { background: url('../images/foundation/orbit/left-arrow-small.png?1358223220'); }
+.lt-ie9 .orbit-wrapper .slider-nav span.right { background: url('../images/foundation/orbit/right-arrow-small.png?1359516974'); }
+.lt-ie9 .orbit-wrapper .slider-nav span.left { background: url('../images/foundation/orbit/left-arrow-small.png?1359516974'); }
/* Bullet Nav ---------------------- */
ul.orbit-bullets { position: absolute; z-index: 30; list-style: none; bottom: -40px; left: 50%; margin-left: -50px; padding: 0; }
-ul.orbit-bullets li { float: left; margin-left: 5px; cursor: pointer; color: #999999; text-indent: -9999px; background: url('../images/foundation/orbit/bullets.jpg?1358223220') no-repeat 4px 0; width: 13px; height: 12px; overflow: hidden; }
+ul.orbit-bullets li { float: left; margin-left: 5px; cursor: pointer; color: #999999; text-indent: -9999px; background: url('../images/foundation/orbit/bullets.jpg?1359516974') no-repeat 4px 0; width: 13px; height: 12px; overflow: hidden; }
ul.orbit-bullets li.active { color: #222222; background-position: -8px 0; }
ul.orbit-bullets li.has-thumb { background: none; width: 100px; height: 75px; }
ul.orbit-bullets li.active.has-thumb { background-position: 0 0; border-top: 2px solid black; }
View
16 javascript/foundation/jquery.foundation.buttons.js
@@ -3,10 +3,10 @@
$.fn.foundationButtons = function (options) {
var $doc = $(document),
- config = $.extend({
- dropdownAsToggle:false,
- activeClass:'active'
- }, options),
+ config = $.extend({
+ dropdownAsToggle:false,
+ activeClass:'active'
+ }, options),
// close all dropdowns except for the dropdown passed
closeDropdowns = function (dropdown) {
@@ -30,11 +30,11 @@
// reset other active states
$doc.on('click.fndtn', '.button.dropdown:not(.split), .button.dropdown.split span', function (e) {
var $el = $(this),
- button = $el.closest('.button.dropdown'),
- dropdown = $('> ul', button);
-
+ button = $el.closest('.button.dropdown'),
+ dropdown = $('> ul', button);
+
// If the click is registered on an actual link or on button element then do not preventDefault which stops the browser from following the link
- if (["A", "BUTTON"].indexOf(e.target.nodeName) == -1){
+ if ($.inArray(e.target.nodeName, ['A', 'BUTTON'])){
e.preventDefault();
}
View
39 javascript/foundation/jquery.foundation.magellan.js
@@ -1,5 +1,5 @@
/*
- * jQuery Foundation Magellan 0.0.1
+ * jQuery Foundation Magellan 0.1.0
* http://foundation.zurb.com
* Copyright 2012, ZURB
* Free to use under the MIT license.
@@ -72,22 +72,25 @@
// Determine when a destination has been reached, ah0y!
var $lastDestination = $('[data-magellan-destination]:last');
- $window.on('scroll.magellan', function(e){
- var windowScrollTop = $window.scrollTop(),
- scrolltopPlusHeight = windowScrollTop+$window.outerHeight(true),
- lastDestinationTop = Math.ceil($lastDestination.offset().top);
- $('[data-magellan-destination]').each(function(){
- var $destination = $(this),
- destination_name = $destination.attr('data-magellan-destination'),
- topOffset = $destination.offset().top - windowScrollTop;
- if (topOffset <= options.threshold) {
- $('[data-magellan-arrival=' + destination_name + ']').trigger('magellan.arrival');
- }
- // In large screens we may hit the bottom of the page and dont reach the top of the last magellan-destination, so lets force it
- if (scrolltopPlusHeight >= $document.outerHeight(true) && lastDestinationTop > windowScrollTop && lastDestinationTop < scrolltopPlusHeight) {
- $('[data-magellan-arrival]:last').trigger('magellan.arrival');
- }
- });
- });
+ // Determine if a destination has been set
+ if ($lastDestination.length > 0) {
+ $window.on('scroll.magellan', function (e) {
+ var windowScrollTop = $window.scrollTop(),
+ scrolltopPlusHeight = windowScrollTop + $window.outerHeight(true),
+ lastDestinationTop = Math.ceil($lastDestination.offset().top);
+ $('[data-magellan-destination]').each(function () {
+ var $destination = $(this),
+ destination_name = $destination.attr('data-magellan-destination'),
+ topOffset = $destination.offset().top - windowScrollTop;
+ if (topOffset <= options.threshold) {
+ $('[data-magellan-arrival=' + destination_name + ']').trigger('magellan.arrival');
+ }
+ // In large screens we may hit the bottom of the page and dont reach the top of the last magellan-destination, so lets force it
+ if (scrolltopPlusHeight >= $document.outerHeight(true) && lastDestinationTop > windowScrollTop && lastDestinationTop < scrolltopPlusHeight) {
+ $('[data-magellan-arrival]:last').trigger('magellan.arrival');
+ }
+ });
+ });
+ }
};
}(jQuery, this));
View
20 javascript/foundation/jquery.foundation.tooltips.js
@@ -120,13 +120,21 @@
objPos(nub, -nubHeight, 'auto', 'auto', 10);
if ($(window).width() < 767) {
- column = target.closest('.columns');
-
- if (column.length < 0) {
- // if not using Foundation
- column = $('body');
+ if (target.data('mobile-width')) {
+ tip.width(target.data('mobile-width')).css('left', 15).addClass('tip-override');
+ } else {
+ column = target.closest('.columns');
+ if (column.length < 0) {
+ // if not using Foundation
+ column = $('body');
+ }
+ if (column.outerWidth()) {
+ tip.width(column.outerWidth() - 25).css('left', 15).addClass('tip-override');
+ } else {
+ var tmp_width = Math.ceil($(window).width() * 0.9);
+ tip.width(tmp_width).css('left', 15).addClass('tip-override');
+ }
}
- tip.width(column.outerWidth() - 25).css('left', 15).addClass('tip-override');
objPos(nub, -nubHeight, 'auto', 'auto', target.offset().left);
} else {
if (classes && classes.indexOf('tip-top') > -1) {
View
8 javascript/foundation/jquery.foundation.topbar.js
@@ -1,5 +1,5 @@
/*
- * jQuery Foundation Top Bar 2.0.3
+ * jQuery Foundation Top Bar 2.0.4
* http://foundation.zurb.com
* Copyright 2012, ZURB
* Free to use under the MIT license.
@@ -42,7 +42,7 @@
$('body').css('padding-top',settings.$topbar.outerHeight())
}
- $('.top-bar .toggle-topbar').die('click.fndtn').live('click.fndtn', function (e) {
+ $('.top-bar .toggle-topbar').off('click.fndtn').on('click.fndtn', function (e) {
e.preventDefault();
if (methods.breakpoint()) {
@@ -59,7 +59,7 @@
});
// Show the Dropdown Levels on Click
- $('.top-bar .has-dropdown>a').die('click.fndtn').live('click.fndtn', function (e) {
+ $('.top-bar .has-dropdown>a').off('click.fndtn').on('click.fndtn', function (e) {
if (Modernizr.touch || methods.breakpoint())
e.preventDefault();
@@ -84,7 +84,7 @@
});
// Go up a level on Click
- $('.top-bar .has-dropdown .back').die('click.fndtn').live('click.fndtn', function (e) {
+ $('.top-bar .has-dropdown .back').off('click.fndtn').on('click.fndtn', function (e) {
e.preventDefault();
var $this = $(this),
View
5,655 javascript/foundation/jquery.js
2,885 additions, 2,770 deletions not shown

0 comments on commit 6ea5584

Please sign in to comment.
Something went wrong with that request. Please try again.