Merge pull request #13 from winghouchan/master

Update Foundation
foundation · May 29, 2014 · a066691 · a066691
2 parents f18ca41 + f5c2181
commit a066691
Show file tree

Hide file tree

Showing 44 changed files with 288 additions and 185 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,7 @@ test/scss/output-test
 test/tmp
 test/version_tmp
 tmp
+
+
+pizza/
+docs/*
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -57,15 +57,6 @@ module.exports = function(grunt) {
           'dist/assets/css/normalize.css': 'scss/normalize.scss',
           'dist/docs/assets/css/docs.css': 'doc/assets/scss/docs.scss'
         }
-      },
-      dist_compressed: {
-        options: {
-          outputStyle:'compressed',
-          includePaths: ['scss']
-        },
-        files: {
-          'dist/assets/css/foundation.min.css': '<%= foundation.scss %>'
-        }
       }
     },
 
@@ -208,7 +199,7 @@ module.exports = function(grunt) {
           src: "./dist/docs/",
           recursive: true,
           dest: "/home/deployer/sites/foundation-docs/current",
-          host: "deployer@foundation5.zurb.com"
+          host: "deployer@72.32.134.77"
         }
       }
     }
@@ -226,7 +217,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-rsync');
   grunt.loadNpmTasks('grunt-sass');
   grunt.loadNpmTasks('grunt-contrib-jst');
-
+  
   grunt.task.registerTask('watch_start', ['karma:dev_watch:start', 'watch']);
   grunt.registerTask('build:assets', ['clean', 'sass', 'concat', 'uglify', 'copy', 'jst']);
   grunt.registerTask('build', ['build:assets', 'assemble']);

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "foundation",
-  "version": "5.2.2",
+  "version": "5.2.3",
   "main": [
     "css/foundation.css",
     "js/foundation.js"

diff --git a/doc/assets/scss/_sidebar.scss b/doc/assets/scss/_sidebar.scss
@@ -19,6 +19,7 @@ $panel-bg-color: #FAFAFA;
   }
 .side-nav li a {
   padding: rem-calc(6) 0;
+  &:not(.button) { padding: rem-calc(6) 0; }
   &:hover {
     color: darken($primary-color, 20%);
     span {

diff --git a/doc/includes/block/examples_block_variables.html b/doc/includes/block/examples_block_variables.html
@@ -3,6 +3,7 @@
 // We use this to control the maximum blocks and spacing 
 $block-grid-elements: 12;
 $block-grid-default-spacing: rem-calc(20);
+$align-block-grid-to-grid: false; //removes column gutter so edges of block grid align with grid
 
 // Enables media queries for block-grid classes. Set to false if writing semantic HTML.
 $block-grid-media-queries: true;

diff --git a/doc/includes/tabs/examples_tabs_basic.html b/doc/includes/tabs/examples_tabs_basic.html
@@ -1,9 +1,9 @@
-<dl class="tabs" data-tab>
-  <dd class="active"><a href="#panel2-1">Tab 1</a></dd>
-  <dd><a href="#panel2-2">Tab 2</a></dd>
-  <dd><a href="#panel2-3">Tab 3</a></dd>
-  <dd><a href="#panel2-4">Tab 4</a></dd>
-</dl>
+<ul class="tabs" data-tab>
+  <li class="tab-title active"><a href="#panel2-1">Tab 1</a></li>
+  <li class="tab-title"><a href="#panel2-2">Tab 2</a></li>
+  <li class="tab-title"><a href="#panel2-3">Tab 3</a></li>
+  <li class="tab-title"><a href="#panel2-4">Tab 4</a></li>
+</ul>
 <div class="tabs-content">
   <div class="content active" id="panel2-1">
     <p>First panel content goes here...</p>

diff --git a/doc/includes/tabs/examples_tabs_basic_rendered.html b/doc/includes/tabs/examples_tabs_basic_rendered.html
@@ -1,9 +1,9 @@
-<dl class="tabs" data-tab>
-  <dd class="active"><a href="#panel2-1">Tab 1</a></dd>
-  <dd><a href="#panel2-2">Tab 2</a></dd>
-  <dd><a href="#panel2-3">Tab 3</a></dd>
-  <dd><a href="#panel2-4">Tab 4</a></dd>
-</dl>
+<ul class="tabs" data-tab>
+  <li class="tab-title active"><a href="#panel2-1">Tab 1</a></li>
+  <li class="tab-title"><a href="#panel2-2">Tab 2</a></li>
+  <li class="tab-title"><a href="#panel2-3">Tab 3</a></li>
+  <li class="tab-title"><a href="#panel2-4">Tab 4</a></li>
+</ul>
 <div class="tabs-content">
   <div class="content active" id="panel2-1">
     <p>This is the first panel of the basic tab example. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Laboriosam, pariatur accusantium magni cumque vel voluptates illum repellendus sed dignissimos magnam! Deleniti, fugit tempore quibusdam molestias iusto asperiores incidunt sint nemo?</p>

diff --git a/doc/includes/tabs/examples_tabs_intro.html b/doc/includes/tabs/examples_tabs_intro.html
@@ -1,9 +1,9 @@
-<dl class="radius tabs" data-tab>
-  <dd class="active"><a href="#panel1">Tab 1</a></dd>
-  <dd><a href="#panel2">Tab 2</a></dd>
-  <dd><a href="#panel3">Tab 3</a></dd>
-  <dd><a href="#panel4">Tab 4</a></dd>
-</dl>
+<ul class="radius tabs" data-tab>
+  <li class="tab-title active"><a href="#panel1">Tab 1</a></li>
+  <li class="tab-title"><a href="#panel2">Tab 2</a></li>
+  <li class="tab-title"><a href="#panel3">Tab 3</a></li>
+  <li class="tab-title"><a href="#panel4">Tab 4</a></li>
+</ul>
 <div class="tabs-content">
   <div class="content active" id="panel1">
     <p>First panel content goes here. Panel 1. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>

diff --git a/doc/includes/tabs/examples_tabs_vertical_basic.html b/doc/includes/tabs/examples_tabs_vertical_basic.html
@@ -1,9 +1,9 @@
-<dl class="tabs vertical" data-tab>
-  <dd class="active"><a href="#panel1a">Tab 1</a></dd>
-  <dd><a href="#panel2a">Tab 2</a></dd>
-  <dd><a href="#panel3a">Tab 3</a></dd>
-  <dd><a href="#panel4a">Tab 4</a></dd>
-</dl>
+<ul class="tabs vertical" data-tab>
+  <li class="tab-title active"><a href="#panel1a">Tab 1</a></li>
+  <li class="tab-title"><a href="#panel2a">Tab 2</a></li>
+  <li class="tab-title"><a href="#panel3a">Tab 3</a></li>
+  <li class="tab-title"><a href="#panel4a">Tab 4</a></li>
+</ul>
 <div class="tabs-content vertical">
   <div class="content active" id="panel1a">
     <p>Panel 1 content goes here.</p>

diff --git a/doc/includes/tabs/examples_tabs_vertical_basic_rendered.html b/doc/includes/tabs/examples_tabs_vertical_basic_rendered.html
@@ -1,9 +1,9 @@
-<dl class="tabs vertical" data-tab>
-  <dd class="active"><a href="#panel1a">Tab 1</a></dd>
-  <dd><a href="#panel2a">Tab 2</a></dd>
-  <dd><a href="#panel3a">Tab 3</a></dd>
-  <dd><a href="#panel4a">Tab 4</a></dd>
-</dl>
+<ul class="tabs vertical" data-tab>
+  <li class="tab-title active"><a href="#panel1a">Tab 1</a></li>
+  <li class="tab-title"><a href="#panel2a">Tab 2</a></li>
+  <li class="tab-title"><a href="#panel3a">Tab 3</a></li>
+  <li class="tab-title"><a href="#panel4a">Tab 4</a></li>
+</ul>
 <div class="tabs-content vertical">
   <div class="content active" id="panel1a">
     <p>Panel 1 content goes here. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Et, culpa, eos, laboriosam delectus sequi asperiores labore fuga ex molestias a assumenda nesciunt libero consequatur nulla deserunt eveniet ea nobis magni!</p>

diff --git a/doc/includes/tooltips/examples_tooltips_show.html b/doc/includes/tooltips/examples_tooltips_show.html
@@ -0,0 +1 @@
+<h3 class="subheader">Now tooltips have data-options! This tooltip will only <span data-tooltip class="has-tip" data-options="show_on: large" title="Large Screen Sizes">show on</span>.</h3>
diff --git a/doc/includes/tooltips/examples_tooltips_show_rendered.html b/doc/includes/tooltips/examples_tooltips_show_rendered.html
@@ -0,0 +1,5 @@
+{{#markdown}}
+```html
+<span data-tooltip class="has-tip" data-options="show_on:large" title="Large Screen Sizes">show on</span>
+```
+{{/markdown}}
diff --git a/doc/layouts/kitchen.html b/doc/layouts/kitchen.html
@@ -26,7 +26,7 @@
     <script src="{{assets}}/js/modernizr.js"></script>
   </head>
   <body class="antialiased hide-extras">
-    <div class="marketing off-canvas-wrap">
+    <div class="marketing off-canvas-wrap" data-offcanvas>
       <div class="inner-wrap">
 
 {{> topbar}}

diff --git a/doc/pages/changelog.html b/doc/pages/changelog.html
@@ -27,6 +27,22 @@ <h3 class="subheader">Here's a summary of all of our releases of Foundation so f
 
 ***
 
+### 5.2.3- May 28, 2014
+
+  * Numerous fixes and changes to Orbit for performance and functionality
+  * Lots of documentation updates, class options, explanations, markup examples
+  * Equalizer can now equalize when stacked, or in block grid [931f047](https://github.com/zurb/foundation/commit/931f047b86223257c04806a1a162062c654aff33)
+  * Accordion can now be spread across different parent containers [3acb3e7](https://github.com/zurb/foundation/commit/3acb3e7c7dc0fb5152b39c550cc94e577b028c8b)
+  * Adds accessability classes [db38232](https://github.com/zurb/foundation/commit/db38232a23ef8fede62ad6b45c19857f8237e6ac)
+  * Joyride Threshold implemented and fixed top option added [9cc7098](https://github.com/zurb/foundation/commit/9cc709802443f90639eeccfdf6a7836dd9744652)
+  * Added accordion toggle callback [2344a82](https://github.com/zurb/foundation/commit/fd42e979aaf9bd7e8ad171c37e2c250fbbb4a5a1)
+  * Offcanvas can now overlap content instead of pushing content [5cc0934](https://github.com/zurb/foundation/commit/66097454aac5f44e04ed08c74dabfee8ab745176)
+  * Added event bindings and much more to Off-canvas [7a799ba](https://github.com/zurb/foundation/commit/0912a932ff8313dbb1770f09c51c8d0ef447d2d4)
+  * Allow controlling heading sizes on small screens [596d5f9](https://github.com/zurb/foundation/commit/596d5f9e0eaa79faa89c821fca1f760884df4f09)
+  * And tons of other fixes and improvements. Over 320 commits in this release. Boom!
+
+You can compare the commits [here](https://github.com/zurb/foundation/compare/v5.2.2...v5.2.3)
+
 ### 5.2.2- April 3, 2014
 
   * Numerous fixes and changes to Orbit for performance and functionality

diff --git a/doc/pages/components/orbit.html b/doc/pages/components/orbit.html
@@ -10,6 +10,12 @@ <h3 class="subheader">Orbit is an easy, powerful, responsive image slider that a
 
 ***
 
+Deprecation Notice:
+
+Orbit has been deprecated meaning that it is no longer supported. There's no need to fret though as there are other great options if you need an image slider. 
+
+***
+
 <a name="setup"></a>
 
 ## How to Setup Orbit

diff --git a/doc/pages/components/tooltips.html b/doc/pages/components/tooltips.html
@@ -43,6 +43,20 @@ <h4>Rendered HTML</h4>
 
 <span data-tooltip class="has-tip tip-bottom radius" title="Tooltips are awesome, you should totally use them!">Hover on desktop and touch me on mobile!</span>
 
+
+<p>You can now also add `show_on` to your `data-options` attribute to allow your tooltips to show on `small`, `medium`, or `large` when the page loads. They will show on all screen sizes by default.</p>
+
+<div class="row">
+  <div class="large-6 columns">
+    <h4>HTML</h4>
+    {{> examples_tooltips_show_rendered}}
+  </div>
+  <div class="large-6 columns">
+    <h4>Rendered HTML</h4>
+    {{> examples_tooltips_show}}
+  </div>
+</div>
+
 &nbsp;
 
 <h3>Disable for touch events</h3>
@@ -102,15 +116,15 @@ <h4>JS</h4>
 {{#markdown}}
 ```js
 $(document).foundation({
-  tooltips: {
+  tooltip: {
     selector : '.has-tip',
     additional_inheritable_classes : [],
     tooltip_class : '.tooltip',
     touch_close_text: 'tap to close',
     disable_for_touch: false,
     tip_template : function (selector, content) {
       return '<span data-selector="' + selector + '" class="'
-        + Foundation.libs.tooltips.settings.tooltipClass.substring(1)
+        + Foundation.libs.tooltip.settings.tooltip_class.substring(1)
         + '">' + content + '<span class="nub"></span></span>';
     }
   }

diff --git a/docs/advanced-foundation-course b/docs/advanced-foundation-course
diff --git a/js/foundation/foundation.abide.js b/js/foundation/foundation.abide.js
@@ -4,7 +4,7 @@
   Foundation.libs.abide = {
     name : 'abide',
 
-    version : '5.2.2',
+    version : '5.2.3',
 
     settings : {
       live_validate : true,

diff --git a/js/foundation/foundation.accordion.js b/js/foundation/foundation.accordion.js
@@ -4,7 +4,7 @@
   Foundation.libs.accordion = {
     name : 'accordion',
 
-    version : '5.2.2',
+    version : '5.2.3',
 
     settings : {
       active_class: 'active',

diff --git a/js/foundation/foundation.alert.js b/js/foundation/foundation.alert.js
@@ -4,7 +4,7 @@
   Foundation.libs.alert = {
     name : 'alert',
 
-    version : '5.2.2',
+    version : '5.2.3',
 
     settings : {
       callback: function (){}

diff --git a/js/foundation/foundation.clearing.js b/js/foundation/foundation.clearing.js
@@ -4,7 +4,7 @@
   Foundation.libs.clearing = {
     name : 'clearing',
 
-    version: '5.2.2',
+    version: '5.2.3',
 
     settings : {
       templates : {
@@ -42,10 +42,11 @@
 
     events : function (scope) {
       var self = this,
-      S = self.S;
+          S = self.S,
+          $scroll_container = $('.scroll-container');
 
-      if ($('.scroll-container').length > 0) {
-        this.scope = $('.scroll-container');
+      if ($scroll_container.length > 0) {
+        this.scope = $scroll_container;
       }
 
       S(this.scope)
@@ -151,8 +152,10 @@
       }
 
       $el.after('<div id="foundationClearingHolder"></div>');
-      var grid = $el.detach();
-      var grid_outerHTML = '';
+
+      var grid = $el.detach(),
+          grid_outerHTML = '';
+
       if (grid[0] == null) {
         return;
       } else {
@@ -161,7 +164,6 @@
 
       var holder = this.S('#foundationClearingHolder'),
           settings = $el.data(this.attr_name(true) + '-init'),
-          grid = $el.detach(),
           data = {
             grid: '<div class="carousel">' + grid_outerHTML + '</div>',
             viewing: settings.templates.viewing
@@ -205,7 +207,7 @@
 
       function cb (image) {
         var $image = $(image);
-        image.css('visibility', 'visible');
+        $image.css('visibility', 'visible');
         // toggle the gallery
         body.css('overflow', 'hidden');
         root.addClass('clearing-blackout');
@@ -299,15 +301,15 @@
           self = this;
 
       lis.each(function () {
-          var li = self.S(this),
-              image = li.find('img');
+        var li = self.S(this),
+            image = li.find('img');
 
-          if (li.height() > image.outerHeight()) {
-            li.addClass('fix-height');
-          }
-        })
-        .closest('ul')
-        .width(lis.length * 100 + '%');
+        if (li.height() > image.outerHeight()) {
+          li.addClass('fix-height');
+        }
+      })
+      .closest('ul')
+      .width(lis.length * 100 + '%');
 
       return this;
     },
@@ -318,19 +320,15 @@
         .siblings('.visible-img');
 
       if (target.next().length > 0) {
-        this.S('.clearing-main-next', visible_image)
-          .removeClass('disabled');
+        this.S('.clearing-main-next', visible_image).removeClass('disabled');
       } else {
-        this.S('.clearing-main-next', visible_image)
-          .addClass('disabled');
+        this.S('.clearing-main-next', visible_image).addClass('disabled');
       }
 
       if (target.prev().length > 0) {
-        this.S('.clearing-main-prev', visible_image)
-          .removeClass('disabled');
+        this.S('.clearing-main-prev', visible_image).removeClass('disabled');
       } else {
-        this.S('.clearing-main-prev', visible_image)
-          .addClass('disabled');
+        this.S('.clearing-main-prev', visible_image).addClass('disabled');
       }
     },
 
@@ -370,10 +368,12 @@
     // image loading and preloading
 
     load : function ($image) {
+      var href;
+
       if ($image[0].nodeName === "A") {
-        var href = $image.attr('href');
+        href = $image.attr('href');
       } else {
-        var href = $image.parent().attr('href');
+        href = $image.parent().attr('href');
       }
 
       this.preload($image);
@@ -484,11 +484,9 @@
       this.settings.up_count = up_count;
 
       if (this.adjacent(this.settings.prev_index, target_index)) {
-        if ((target_index > up_count)
-          && target_index > this.settings.prev_index) {
+        if ((target_index > up_count) && target_index > this.settings.prev_index) {
           response = 'right';
-        } else if ((target_index > up_count - 1)
-          && target_index <= this.settings.prev_index) {
+        } else if ((target_index > up_count - 1) && target_index <= this.settings.prev_index) {
           response = 'left';
         } else {
           response = false;