Merge branch '5.3-wip'

foundation · May 28, 2014 · 73cff31 · 73cff31
2 parents e0c7911 + 5ecbfc6
commit 73cff31
Show file tree

Hide file tree

Showing 39 changed files with 259 additions and 180 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 %>'
-        }
       }
     },
 
@@ -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/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/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>

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;

diff --git a/js/foundation/foundation.dropdown.js b/js/foundation/foundation.dropdown.js
@@ -4,7 +4,7 @@
   Foundation.libs.dropdown = {
     name : 'dropdown',
 
-    version : '5.2.2',
+    version : '5.2.3',
 
     settings : {
       active_class: 'open',
@@ -34,15 +34,18 @@
           }
         })
         .on('mouseenter.fndtn.dropdown', '[' + this.attr_name() + '], [' + this.attr_name() + '-content]', function (e) {
-          var $this = S(this);
+          var $this = S(this),
+              dropdown,
+              target;
+
           clearTimeout(self.timeout);
 
           if ($this.data(self.data_attr())) {
-            var dropdown = S('#' + $this.data(self.data_attr())),
-                target = $this;
+            dropdown = S('#' + $this.data(self.data_attr()));
+            target = $this;
           } else {
-            var dropdown = $this;
-                target = S("[" + self.attr_name() + "='" + dropdown.attr('id') + "']");
+            dropdown = $this;
+            target = S("[" + self.attr_name() + "='" + dropdown.attr('id') + "']");
           }
 
           var settings = target.data(self.attr_name(true) + '-init') || self.settings;

diff --git a/js/foundation/foundation.equalizer.js b/js/foundation/foundation.equalizer.js
@@ -4,7 +4,7 @@
   Foundation.libs.equalizer = {
     name : 'equalizer',
 
-    version : '5.2.2',
+    version : '5.2.3',
 
     settings : {
       use_tallest: true,
@@ -70,5 +70,5 @@
       });
     }
   };
-}(jQuery, window, window.document));
+})(jQuery, window, window.document);
 
diff --git a/js/foundation/foundation.interchange.js b/js/foundation/foundation.interchange.js
@@ -4,7 +4,7 @@
   Foundation.libs.interchange = {
     name : 'interchange',
 
-    version : '5.2.2',
+    version : '5.2.3',
 
     cache : {},