zurb-foundation 2.1.4.2 → 2.1.4.3

data/build.rb

@@ -6,7 +6,7 @@ FOUNDATION_REPO_PATH = Pathname.new("/Users/mark/Projects/foundation")
 
 # Specify which files need to be concatenated and in what order
 FOUNDATION_CSS = %w(globals.css typography.css grid.css ui.css forms.css orbit.css reveal.css mobile.css ie.css)
-FOUNDATION_JS = %w(jquery.reveal.js jquery.orbit-1.3.0.js forms.jquery.js jquery.customforms.js jquery.placeholder.min.js app.js)
+FOUNDATION_JS = %w(jquery.reveal.js jquery.orbit-1.3.0.js jquery.customforms.js jquery.placeholder.min.js app.js)
 
 # Clean out vendor/assets
 ASSET_PATH = Pathname.new(File.dirname(__FILE__)).join("vendor", "assets")

data/lib/foundation/version.rb

@@ -1,4 +1,4 @@
 module Foundation
-  COMMIT = "46e71bf06a61fdb8adf3d41aa754a93c61757c59"
-  VERSION = "2.1.4.2"
+  COMMIT = "8cc9238073f8a2062bc9dba7203b4d1f71c21c95"
+  VERSION = "2.1.4.3"
 end

data/vendor/assets/javascripts/foundation/app.js

@@ -57,10 +57,10 @@ $(document).ready(function () {
 	/* DROPDOWN NAV ------------- */
 
 	var currentFoundationDropdown = null;
-	$('.nav-bar li a, .nav-bar li a:after').each(function() {
+	$('.nav-bar li a').each(function() {
 		$(this).data('clicks', 0);
 	});
-	$('.nav-bar li a, .nav-bar li a:after').live('click', function(e) {
+	$('.nav-bar li a').on('click', function(e) {
 		e.preventDefault();
 		if (currentFoundationDropdown !== $(this).index() || currentFoundationDropdown === null) {
 			$(this).data('clicks', 0);
@@ -75,7 +75,7 @@ $(document).ready(function () {
 			window.location = $(this).attr('href');
 		}
 	});
-	$('.nav-bar').live('click', function(e) {
+	$('.nav-bar').on('click', function(e) {
 		e.stopPropagation();
 		if ($(e.target).parents().is('.flyout') || $(e.target).is('.flyout')) {
 			e.preventDefault();

data/vendor/assets/javascripts/foundation/index.js

@@ -1,6 +1,5 @@
 //= require 'foundation/jquery.reveal'
 //= require 'foundation/jquery.orbit-1.3.0'
-//= require 'foundation/forms.jquery'
 //= require 'foundation/jquery.customforms'
 //= require 'foundation/jquery.placeholder.min'
 //= require 'foundation/app'

data/vendor/assets/javascripts/foundation/jquery.customforms.js

@@ -23,33 +23,41 @@ jQuery(document).ready(function ($) {
   }
   appendCustomMarkup('checkbox');
   appendCustomMarkup('radio');
-  
-  $('form.custom select').each(function () {
-    var $this = $(this),
+
+  function appendCustomSelect(sel) {
+    var $this = $(sel),
         $customSelect = $this.next('div.custom.dropdown'),
         $options = $this.find('option'),
         maxWidth = 0,
         $li;
-    
-    if ($customSelect.length === 0) {      
+
+    if ($customSelect.length === 0) {
       $customSelect = $('<div class="custom dropdown"><a href="#" class="selector"></a><ul></ul></div>"');
       $options.each(function () {
         $li = $('<li>' + $(this).html() + '</li>');
         $customSelect.find('ul').append($li);
       });
       $customSelect.prepend('<a href="#" class="current">' + $options.first().html() + '</a>');
-      
+
       $this.after($customSelect);
       $this.hide();
+      
+    } else {
+      // refresh the ul with options from the select in case the supplied markup doesn't match
+      $customSelect.find('ul').html('');
+      $options.each(function () {
+        $li = $('<li>' + $(this).html() + '</li>');
+        $customSelect.find('ul').append($li);
+      });
     }
-    
+
     $options.each(function (index) {
       if (this.selected) {
         $customSelect.find('li').eq(index).addClass('selected');
         $customSelect.find('.current').html($(this).html());
       }
     });
-    
+
     $customSelect.find('li').each(function () {
       $customSelect.addClass('open');
       if ($(this).outerWidth() > maxWidth) {
@@ -59,11 +67,51 @@ jQuery(document).ready(function ($) {
     });
     $customSelect.css('width', maxWidth + 18 + 'px');
     $customSelect.find('ul').css('width', maxWidth + 16 + 'px');
+
+  }
+
+  $('form.custom select').each(function () {
+    appendCustomSelect(this);
   });
+  
 });
 
 (function ($) {
   
+  function refreshCustomSelect($select) {
+    var maxWidth = 0,
+        $customSelect = $select.next();
+    $options = $select.find('option');
+    $customSelect.find('ul').html('');
+    
+    $options.each(function () {
+      $li = $('<li>' + $(this).html() + '</li>');
+      $customSelect.find('ul').append($li);
+    });
+    
+    // re-populate
+    $options.each(function (index) {
+      if (this.selected) {
+        $customSelect.find('li').eq(index).addClass('selected');
+        $customSelect.find('.current').html($(this).html());
+      }
+    });
+    
+    // fix width
+    $customSelect.removeAttr('style')
+      .find('ul').removeAttr('style');
+    $customSelect.find('li').each(function () {
+      $customSelect.addClass('open');
+      if ($(this).outerWidth() > maxWidth) {
+        maxWidth = $(this).outerWidth();
+      }
+      $customSelect.removeClass('open');
+    });
+    $customSelect.css('width', maxWidth + 18 + 'px');
+    $customSelect.find('ul').css('width', maxWidth + 16 + 'px');
+    
+  }
+  
   function toggleCheckbox($element) {
     var $input = $element.prev(),
         input = $input[0];
@@ -87,21 +135,25 @@ jQuery(document).ready(function ($) {
     $input.trigger('change');
   }
   
-  $(document).on('click', 'form.custom span.custom.checkbox', function (event) {
+  $('form.custom span.custom.checkbox').live('click', function (event) {
     event.preventDefault();
     event.stopPropagation();
     
     toggleCheckbox($(this));
   });
   
-  $(document).on('click', 'form.custom span.custom.radio', function (event) {
+  $('form.custom span.custom.radio').live('click', function (event) {
     event.preventDefault();
     event.stopPropagation();
     
     toggleRadio($(this));
   });
   
-  $(document).on('click', 'form.custom label', function (event) {
+  $('form.custom select').live('change', function (event) {
+    refreshCustomSelect($(this));
+  });
+  
+  $('form.custom label').live('click', function (event) {
     var $associatedElement = $('#' + $(this).attr('for')),
         $customCheckbox,
         $customRadio;
@@ -118,7 +170,7 @@ jQuery(document).ready(function ($) {
     }
   });
 
-  $(document).on('click', 'form.custom div.custom.dropdown a.current, form.custom div.custom.dropdown a.selector', function (event) {
+  $('form.custom div.custom.dropdown a.current, form.custom div.custom.dropdown a.selector').live('click', function (event) {
     var $this = $(this),
         $dropdown = $this.closest('div.custom.dropdown');
     
@@ -135,7 +187,7 @@ jQuery(document).ready(function ($) {
     }
   });
   
-  $(document).on('click', 'form.custom div.custom.dropdown li', function (event) {
+  $('form.custom div.custom.dropdown li').live('click', function (event) {
     var $this = $(this),
         $customDropdown = $this.closest('div.custom.dropdown'),
         $select = $customDropdown.prev(),
@@ -167,4 +219,3 @@ jQuery(document).ready(function ($) {
   });
 })(jQuery);
 
-

data/vendor/assets/javascripts/foundation/jquery.placeholder.min.js

@@ -1,3 +1,3 @@
-/*! http://mths.be/placeholder v1.8.5 by @mathias */
-(function(g,a,$){var f='placeholder' in a.createElement('input'),b='placeholder' in a.createElement('textarea');if(f&&b){$.fn.placeholder=function(){return this};$.fn.placeholder.input=$.fn.placeholder.textarea=true}else{$.fn.placeholder=function(){return this.filter((f?'textarea':':input')+'[placeholder]').bind('focus.placeholder',c).bind('blur.placeholder',e).trigger('blur.placeholder').end()};$.fn.placeholder.input=f;$.fn.placeholder.textarea=b;$(function(){$('form').bind('submit.placeholder',function(){var h=$('.placeholder',this).each(c);setTimeout(function(){h.each(e)},10)})});$(g).bind('unload.placeholder',function(){$('.placeholder').val('')})}function d(i){var h={},j=/^jQuery\d+$/;$.each(i.attributes,function(l,k){if(k.specified&&!j.test(k.name)){h[k.name]=k.value}});return h}function c(){var h=$(this);if(h.val()===h.attr('placeholder')&&h.hasClass('placeholder')){if(h.data('placeholder-password')){h.hide().next().show().focus().attr('id',h.removeAttr('id').data('placeholder-id'))}else{h.val('').removeClass('placeholder')}}}function e(){var l,k=$(this),h=k,j=this.id;if(k.val()===''){if(k.is(':password')){if(!k.data('placeholder-textinput')){try{l=k.clone().attr({type:'text'})}catch(i){l=$('<input>').attr($.extend(d(this),{type:'text'}))}l.removeAttr('name').data('placeholder-password',true).data('placeholder-id',j).bind('focus.placeholder',c);k.data('placeholder-textinput',l).data('placeholder-id',j).before(l)}k=k.removeAttr('id').hide().prev().attr('id',j).show()}k.addClass('placeholder').val(k.attr('placeholder'))}else{k.removeClass('placeholder')}}}(this,document,jQuery));
+/*! http://mths.be/placeholder v1.8.7 by @mathias */
+(function(f,h,c){var a='placeholder' in h.createElement('input'),d='placeholder' in h.createElement('textarea'),i=c.fn,j;if(a&&d){j=i.placeholder=function(){return this};j.input=j.textarea=true}else{j=i.placeholder=function(){return this.filter((a?'textarea':':input')+'[placeholder]').not('.placeholder').bind('focus.placeholder',b).bind('blur.placeholder',e).trigger('blur.placeholder').end()};j.input=a;j.textarea=d;c(function(){c(h).delegate('form','submit.placeholder',function(){var k=c('.placeholder',this).each(b);setTimeout(function(){k.each(e)},10)})});c(f).bind('unload.placeholder',function(){c('.placeholder').val('')})}function g(l){var k={},m=/^jQuery\d+$/;c.each(l.attributes,function(o,n){if(n.specified&&!m.test(n.name)){k[n.name]=n.value}});return k}function b(){var k=c(this);if(k.val()===k.attr('placeholder')&&k.hasClass('placeholder')){if(k.data('placeholder-password')){k.hide().next().show().focus().attr('id',k.removeAttr('id').data('placeholder-id'))}else{k.val('').removeClass('placeholder')}}}function e(){var o,n=c(this),k=n,m=this.id;if(n.val()===''){if(n.is(':password')){if(!n.data('placeholder-textinput')){try{o=n.clone().attr({type:'text'})}catch(l){o=c('<input>').attr(c.extend(g(this),{type:'text'}))}o.removeAttr('name').data('placeholder-password',true).data('placeholder-id',m).bind('focus.placeholder',b);n.data('placeholder-textinput',o).data('placeholder-id',m).before(o)}n=n.removeAttr('id').hide().prev().attr('id',m).show()}n.addClass('placeholder').val(n.attr('placeholder'))}else{n.removeClass('placeholder')}}}(this,document,jQuery));
 

data/vendor/assets/stylesheets/foundation/globals.css.scss

@@ -121,9 +121,12 @@
 /* -------------------------------------------------- 
 	:: Misc
 ---------------------------------------------------*/
-	.left       { float: left; }
-	.right      { float: right; }
-	.hide     	{ display: none; }
-	.highlight 	{ background: #ff0; }
+	.left        { float: left; }
+	.right       { float: right; }
+	.text-left   { text-align: left; }
+	.text-right  { text-align: right; }
+	.text-center { text-align: center; }
+	.hide        { display: none; }
+	.highlight   { background: #ff0; }
 	
 

data/vendor/assets/stylesheets/foundation/grid.css.scss

@@ -1,4 +1,4 @@
-/* Arfully Masterminded by ZURB */
+/* Artfully Masterminded by ZURB */
 
 /* --------------------------------------------------
 	:: Grid
@@ -80,6 +80,7 @@
 	
 	img, object, embed { max-width: 100%; height: auto; }
 	img { -ms-interpolation-mode: bicubic; }
+	#map_canvas img, .map_canvas img {max-width: none!important;}
 	 
 	 /* Nicolas Gallagher's micro clearfix */
 	 .row:before, .row:after, .clearfix:before, .clearfix:after { content:""; display:table; }

data/vendor/assets/stylesheets/foundation/mobile.css.scss

@@ -66,7 +66,7 @@
 	
 	@media only screen and (max-width: 767px) {
 		.block-grid.mobile { margin-left: 0; }
-		.block-grid.mobile li { float: none; width: 100%; margin-left: 0; }
+		.block-grid.mobile > li { float: none; width: 100%; margin-left: 0; }
 	}
 	
 	
@@ -84,7 +84,6 @@
 	.hide-on-tablets { display: block !important; }
 	.hide-on-desktops { display: none !important; }
 	
-	
 	@media only screen and (max-device-width: 800px), only screen and (device-width: 1024px) and (device-height: 600px), only screen and (width: 1280px) and (orientation: landscape), only screen and (device-width: 800px) {
 		.hide-on-phones { display: block !important; }
 		.hide-on-tablets { display: none !important; }
@@ -95,6 +94,17 @@
 		.show-on-desktops { display: none !important; }
 	}
 	
+	/* Modernizr-enabled tablet targeting */
+	@media only screen and (max-width: 1280px) and (min-width: 768px) {
+		.touch .hide-on-phones { display: block !important; }
+		.touch .hide-on-tablets { display: none !important; }
+		.touch .hide-on-desktops { display: block !important; }
+		
+		.touch .show-on-phones { display: none !important; }
+		.touch .show-on-tablets { display: block !important; }
+		.touch .show-on-desktops { display: none !important; }
+	}
+	
 		
 	@media only screen and (max-width: 767px) {
 		.hide-on-phones { display: none !important; }

data/vendor/assets/stylesheets/foundation/orbit.css.scss

@@ -74,7 +74,7 @@ div.timer {
     right: 10px;
     opacity: .6;
     cursor: pointer;
-    z-index: 1001; }
+    z-index: 31; }
 
 span.rotator {
     display: block;
@@ -133,7 +133,7 @@ span.pause.active {
 .orbit-wrapper .orbit-caption {
     background: #000;
     background: rgba(0,0,0,.6);
-    z-index: 1000;
+    z-index: 30;
     color: #fff;
 	text-align: center;
 	padding: 7px 0;
@@ -155,7 +155,7 @@ div.slider-nav span {
     height: 100px;
     text-indent: -9999px;
     position: absolute;
-    z-index: 1000;
+    z-index: 30;
     top: 50%;
     margin-top: -50px;
     cursor: pointer; }
@@ -173,7 +173,7 @@ div.slider-nav span.left {
 
 .orbit-bullets {
     position: absolute;
-    z-index: 1000;
+    z-index: 30;
     list-style: none;
     bottom: -40px;
     left: 50%;
@@ -217,7 +217,7 @@ div.slider-nav span.left {
 
 .orbit-bullets {
     position: absolute;
-    z-index: 1000;
+    z-index: 30;
     list-style: none;
     bottom: -50px;
     left: 50%;

data/vendor/assets/stylesheets/foundation/reveal.css.scss

@@ -7,7 +7,7 @@
 		height: 100%;
 		width: 100%;
 		background: #000;
-		z-index: 2000;
+		z-index: 40;
 		display: none;
 		top: 0;
 		left: 0; 
@@ -21,7 +21,7 @@
 		width: 520px;
 		background: #eee image-url("foundation/misc/modal-gloss.png") no-repeat -200px -80px;
 		position: absolute;
-		z-index: 2001;
+		z-index: 41;
 		padding: 30px 40px 34px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;

data/vendor/assets/stylesheets/foundation/typography.css.scss

@@ -1,4 +1,4 @@
-/* Arfully Masterminded by ZURB */
+/* Artfully Masterminded by ZURB */
 
 /*	--------------------------------------------------
     :: Typography
@@ -14,9 +14,9 @@
 
 	.subheader { color: #777; font-weight: 300; margin-bottom: 24px; }
 
-	p { line-height: 17px; margin: 0 0 18px; }
+	p { font-size: 13px; font-size: 1.3rem; line-height: 1.25; margin: 0 0 18px; }
 	p img { margin: 0; }
-	p.lead { font-size: 18px; font-size: 1.8rem; line-height: 24px;  }
+	p.lead { font-size: 18px; font-size: 1.8rem; line-height: 1.5;  }
 	
 	em, i { font-style: italic; line-height: inherit; }
 	strong, b { font-weight: bold; line-height: inherit; }

data/vendor/assets/stylesheets/foundation/ui.css.scss

@@ -40,7 +40,7 @@
 	}
 	
   	/* Don't use native buttons on iOS */
-	input[type=submit].button { -webkit-appearance: none; }
+	input[type=submit].button, button.button { -webkit-appearance: none; }
 	
 	.button.nice { 
 		background: #00a6fc image-url("foundation/misc/button-gloss.png") repeat-x 0 -34px;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zurb-foundation
 version: !ruby/object:Gem::Version
-  version: 2.1.4.2
+  version: 2.1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000 -08:00
+date: 2012-01-17 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157596900 !ruby/object:Gem::Requirement
+  requirement: &2154617100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2157596900
+  version_requirements: *2154617100
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2157596400 !ruby/object:Gem::Requirement
+  requirement: &2154616600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157596400
+  version_requirements: *2154616600
 description: An easy to use, powerful, and flexible framework for building prototypes
   and production code on any kind of device.
 email:
@@ -74,7 +74,6 @@ files:
 - vendor/assets/images/foundation/orbit/rotator-black.png
 - vendor/assets/images/foundation/orbit/timer-black.png
 - vendor/assets/javascripts/foundation/app.js
-- vendor/assets/javascripts/foundation/forms.jquery.js
 - vendor/assets/javascripts/foundation/index.js
 - vendor/assets/javascripts/foundation/jquery.customforms.js
 - vendor/assets/javascripts/foundation/jquery.orbit-1.3.0.js
@@ -105,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3483791448875253269
+      hash: 2602047393679453925
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3483791448875253269
+      hash: 2602047393679453925
 requirements: []
 rubyforge_project: foundation
 rubygems_version: 1.6.2

data/vendor/assets/javascripts/foundation/forms.jquery.js

@@ -1,59 +0,0 @@
-/**
- * jQuery.placeholder - Placeholder plugin for input fields
- * Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com)
- * Licensed under the WTFPL (http://sam.zoy.org/wtfpl/).
- * Date: 2008/10/14
- *
- * @author Blair Mitchelmore
- * @version 1.0.1
- *
- **/
-new function($) {
-    $.fn.placeholder = function(settings) {
-        settings = settings || {};
-        var key = settings.dataKey || "placeholderValue";
-        var attr = settings.attr || "placeholder";
-        var className = settings.className || "placeholder";
-        var values = settings.values || [];
-        var block = settings.blockSubmit || false;
-        var blank = settings.blankSubmit || false;
-        var submit = settings.onSubmit || false;
-        var value = settings.value || "";
-        var position = settings.cursor_position || 0;
-
-        
-        return this.filter(":input").each(function(index) { 
-            $.data(this, key, values[index] || $(this).attr(attr)); 
-        }).each(function() {
-            if ($.trim($(this).val()) === "")
-                $(this).addClass(className).val($.data(this, key));
-        }).focus(function() {
-            if ($.trim($(this).val()) === $.data(this, key)) 
-                $(this).removeClass(className).val(value)
-                if ($.fn.setCursorPosition) {
-                  $(this).setCursorPosition(position);
-                }
-        }).blur(function() {
-            if ($.trim($(this).val()) === value)
-                $(this).addClass(className).val($.data(this, key));
-        }).each(function(index, elem) {
-            if (block)
-                new function(e) {
-                    $(e.form).submit(function() {
-                        return $.trim($(e).val()) != $.data(e, key)
-                    });
-                }(elem);
-            else if (blank)
-                new function(e) {
-                    $(e.form).submit(function() {
-                        if ($.trim($(e).val()) == $.data(e, key)) 
-                            $(e).removeClass(className).val("");
-                        return true;
-                    });
-                }(elem);
-            else if (submit)
-                new function(e) { $(e.form).submit(submit); }(elem);
-        });
-    };
-}(jQuery);
-