Skip to content

Commit

Permalink
Bump to version 6.0.1 and generate new dist files
Browse files Browse the repository at this point in the history
  • Loading branch information
gakimball committed Nov 20, 2015
1 parent f95179b commit 61719e4
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 55 deletions.
4 changes: 2 additions & 2 deletions bower.json
@@ -1,6 +1,6 @@
{
"name": "foundation-sites",
"version": "6.0.0-rc.1",
"version": "6.0.1",
"main": [
"scss/foundation.scss",
"js/foundation.js"
Expand All @@ -12,7 +12,7 @@
"spec"
],
"dependencies": {
"jquery": ">= 2.1.0",
"jquery": "~2.1.0",
"what-input": "~1.1.2"
}
}
2 changes: 1 addition & 1 deletion composer.json
@@ -1,7 +1,7 @@
{
"name": "zurb/foundation-sites",
"description": "The most advanced responsive front-end framework in the world.",
"version": "6.0.0",
"version": "6.0.1",
"keywords": [
"css",
"scss",
Expand Down
5 changes: 3 additions & 2 deletions dist/foundation.css
Expand Up @@ -463,7 +463,7 @@ button {
float: left;
padding-left: 0.9375rem;
padding-right: 0.9375rem; }
.column:last-child, .columns:last-child {
.column:last-child:not(:first-child), .columns:last-child:not(:first-child) {
float: right; }
.column.end, .end.columns {
float: left; }
Expand Down Expand Up @@ -2328,7 +2328,8 @@ body {
position: absolute;
background: #e6e6e6;
z-index: -1;
min-height: 100%;
max-height: 100%;
overflow-y: auto;
-webkit-transform: translateX(0px);
-ms-transform: translateX(0px);
transform: translateX(0px); }
Expand Down
82 changes: 42 additions & 40 deletions dist/foundation.js
Expand Up @@ -2,7 +2,7 @@

"use strict";

var FOUNDATION_VERSION = '6.0.0';
var FOUNDATION_VERSION = '6.0.1';

// Global Foundation object
// This is attached to the window, or used as a module for AMD/Browserify
Expand Down Expand Up @@ -33,10 +33,10 @@ var Foundation = {
* Defines a Foundation plugin, adding it to the `Foundation` namespace and the list of plugins to initialize when reflowing.
* @param {Object} plugin - The constructor of the plugin.
*/
plugin: function(plugin) {
plugin: function(plugin, name) {
// Object key to use when adding to global Foundation object
// Examples: Foundation.Reveal, Foundation.OffCanvas
var className = functionName(plugin);
var className = (name || functionName(plugin));
// Object key to use when storing the plugin, also used to create the identifying data attribute for the plugin
// Examples: data-reveal, data-off-canvas
var attrName = hyphenate(className);
Expand Down Expand Up @@ -2011,7 +2011,7 @@ Foundation.Motion = Motion;
//TODO this...
};

Foundation.plugin(Abide);
Foundation.plugin(Abide, 'Abide');

// Exports for AMD/Browserify
if (typeof module !== 'undefined' && typeof module.exports !== 'undefined')
Expand Down Expand Up @@ -2247,7 +2247,7 @@ Foundation.Motion = Motion;
Foundation.unregisterPlugin(this);
};

Foundation.plugin(Accordion);
Foundation.plugin(Accordion, 'Accordion');
}(jQuery, window.Foundation);

/**
Expand Down Expand Up @@ -2508,7 +2508,7 @@ Foundation.Motion = Motion;
Foundation.unregisterPlugin(this);
};

Foundation.plugin(AccordionMenu);
Foundation.plugin(AccordionMenu, 'AccordionMenu');
}(jQuery, window.Foundation);

/**
Expand Down Expand Up @@ -2825,7 +2825,7 @@ Foundation.Motion = Motion;

Foundation.unregisterPlugin(this);
};
Foundation.plugin(Drilldown);
Foundation.plugin(Drilldown, 'Drilldown');
}(jQuery, window.Foundation);

/**
Expand Down Expand Up @@ -3146,7 +3146,7 @@ Foundation.Motion = Motion;
Foundation.unregisterPlugin(this);
};

Foundation.plugin(Dropdown);
Foundation.plugin(Dropdown, 'Dropdown');
}(jQuery, window.Foundation);

/**
Expand Down Expand Up @@ -3328,25 +3328,26 @@ Foundation.Motion = Motion;
var _this = this;

if(this.options.clickOpen){
$elem.children('a').on('click.zf.dropdownmenu touchend.zf.dropdownmenu', function(e){
if($(e.target).parent('li').hasClass('has-submenu')){
e.preventDefault();
e.stopPropagation();
}else{
return;
}
$elem.off('click.zf.dropdownmenu')
.on('click.zf.dropdownmenu', function(e){
if(!$(this).hasClass('is-dropdown-submenu-parent')){ return; }

if($elem.data('isClick')){
_this._hide($elem);
}else{
_this._hideOthers($elem);
_this._show($elem);
$elem.data('isClick', true).parentsUntil('[data-dropdown-menu]', '.has-submenu').data('isClick', true);
if(_this.options.closeOnClick){
_this._addBodyHandler();
}
}
});
e.preventDefault();
e.stopPropagation();

if($elem.data('isClick')){
_this._hide($elem);
}else{
_this._hideOthers($elem);
_this._show($elem);
$elem.data('isClick', true)
.parentsUntil('[data-dropdown-menu]', '.is-dropdown-submenu-parent')
.data('isClick', true);
if(_this.options.closeOnClick){
_this._addBodyHandler();
}
}
});
}

if(!this.options.disableHover){
Expand Down Expand Up @@ -3608,7 +3609,8 @@ Foundation.Motion = Motion;
Foundation.Nest.Burn(this.$element, 'dropdown');
Foundation.unregisterPlugin(this);
};
Foundation.plugin(DropdownMenu);

Foundation.plugin(DropdownMenu, 'DropdownMenu');

var checkClass = function($elem){
return $elem.hasClass('is-active');
Expand Down Expand Up @@ -3762,7 +3764,7 @@ Foundation.Motion = Motion;
//TODO this.
};

Foundation.plugin(Equalizer);
Foundation.plugin(Equalizer, 'Equalizer');

// Exports for AMD/Browserify
if (typeof module !== 'undefined' && typeof module.exports !== 'undefined')
Expand Down Expand Up @@ -3947,7 +3949,7 @@ Foundation.Motion = Motion;
Interchange.prototype.destroy = function(){
//TODO this.
};
Foundation.plugin(Interchange);
Foundation.plugin(Interchange, 'Interchange');

// Exports for AMD/Browserify
if (typeof module !== 'undefined' && typeof module.exports !== 'undefined')
Expand Down Expand Up @@ -4153,7 +4155,7 @@ Foundation.Motion = Motion;

Foundation.unregisterPlugin(this);
};
Foundation.plugin(Magellan);
Foundation.plugin(Magellan, 'Magellan');

// Exports for AMD/Browserify
if (typeof module !== 'undefined' && typeof module.exports !== 'undefined')
Expand Down Expand Up @@ -4483,7 +4485,7 @@ OffCanvas.prototype.destroy = function(){
//TODO make this...
};

Foundation.plugin(OffCanvas);
Foundation.plugin(OffCanvas, 'OffCanvas');

}(jQuery, Foundation);

Expand Down Expand Up @@ -4882,7 +4884,7 @@ Foundation.plugin(OffCanvas);
Foundation.unregisterPlugin(this);
};

Foundation.plugin(Orbit);
Foundation.plugin(Orbit, 'Orbit');

}(jQuery, window.Foundation);

Expand Down Expand Up @@ -5028,7 +5030,7 @@ Foundation.plugin(OffCanvas);
$(window).off('.zf.ResponsiveMenu');
Foundation.unregisterPlugin(this);
};
Foundation.plugin(ResponsiveMenu);
Foundation.plugin(ResponsiveMenu, 'ResponsiveMenu');

}(Foundation, jQuery);

Expand Down Expand Up @@ -5135,7 +5137,7 @@ ResponsiveToggle.prototype.toggleMenu = function() {
ResponsiveToggle.prototype.destroy = function(){
//TODO this...
};
Foundation.plugin(ResponsiveToggle);
Foundation.plugin(ResponsiveToggle, 'ResponsiveToggle');

}(jQuery, Foundation);

Expand Down Expand Up @@ -5605,7 +5607,7 @@ Foundation.plugin(ResponsiveToggle);
Foundation.unregisterPlugin(this);
};

Foundation.plugin(Reveal);
Foundation.plugin(Reveal, 'Reveal');

// Exports for AMD/Browserify
if (typeof module !== 'undefined' && typeof module.exports !== 'undefined')
Expand Down Expand Up @@ -6066,7 +6068,7 @@ Foundation.plugin(ResponsiveToggle);
Foundation.unregisterPlugin(this);
};

Foundation.plugin(Slider);
Foundation.plugin(Slider, 'Slider');

function percent(frac, num){
return (frac / num);
Expand Down Expand Up @@ -6540,7 +6542,7 @@ Foundation.plugin(ResponsiveToggle);
function emCalc(em){
return parseInt(window.getComputedStyle(document.body, null).fontSize, 10) * em;
}
Foundation.plugin(Sticky);
Foundation.plugin(Sticky, 'Sticky');
}(jQuery, window.Foundation);

/**
Expand Down Expand Up @@ -6842,7 +6844,7 @@ Foundation.plugin(ResponsiveToggle);
Foundation.unregisterPlugin(this);
};

Foundation.plugin(Tabs);
Foundation.plugin(Tabs, 'Tabs');

function checkClass($elem){
return $elem.hasClass('is-active');
Expand Down Expand Up @@ -7009,7 +7011,7 @@ Foundation.plugin(ResponsiveToggle);
Foundation.unregisterPlugin(this);
};

Foundation.plugin(Toggler);
Foundation.plugin(Toggler, 'Toggler');

// Exports for AMD/Browserify
if (typeof module !== 'undefined' && typeof module.exports !== 'undefined')
Expand Down Expand Up @@ -7448,7 +7450,7 @@ Foundation.plugin(ResponsiveToggle);
* TODO utilize resize event trigger
*/

Foundation.plugin(Tooltip);
Foundation.plugin(Tooltip, 'Tooltip');
}(jQuery, window.document, window.Foundation);

;(function(root, factory) {
Expand Down
2 changes: 1 addition & 1 deletion dist/foundation.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/foundation.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/pages/base-typography.md
Expand Up @@ -69,7 +69,7 @@ Header | Default | Large and up
By inserting a `<small>` element into a header Foundation will scale the header font size down for an inline element, allowing you to use this for subtitles or other secondary header text.

```html_example
<h3>Foundation for Sites <small>Version 6.0.0</small></h3>
<h3>Foundation for Sites <small>Version 6.0.1</small></h3>
```

---
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/typography-base.md
Expand Up @@ -69,7 +69,7 @@ Header | Default | Large and up
By inserting a `<small>` element into a header Foundation will scale the header font size down for an inline element, allowing you to use this for subtitles or other secondary header text.

```html_example
<h3>Foundation for Sites <small>Version 6.0.0</small></h3>
<h3>Foundation for Sites <small>Version 6.0.1</small></h3>
```

---
Expand Down
2 changes: 1 addition & 1 deletion js/foundation.core.js
Expand Up @@ -2,7 +2,7 @@

"use strict";

var FOUNDATION_VERSION = '6.0.0';
var FOUNDATION_VERSION = '6.0.1';

// Global Foundation object
// This is attached to the window, or used as a module for AMD/Browserify
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "foundation-sites",
"version": "6.0.0",
"version": "6.0.1",
"main": "dist/foundation.js",
"description": "The most advanced responsive front-end framework in the world.",
"author": "ZURB <foundation@zurb.com> (http://foundation.zurb.com)",
Expand Down
2 changes: 0 additions & 2 deletions scss/foundation.scss
Expand Up @@ -2,8 +2,6 @@
// foundation.zurb.com
// Licensed under MIT Open Source

$foundation-version: '6.0.0';

// Third-party libraries
@import 'vendor/normalize';

Expand Down

0 comments on commit 61719e4

Please sign in to comment.