zurb-foundation 3.0.8.rc1 → 3.0.8

data/foundation.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "compass", [">= 0.12.2"]
   gem.add_dependency "sass", [">= 3.2.0.alpha.244"]
+  gem.add_dependency "modular-scale", [">= 1.0.0"]
   gem.add_dependency "rake"
 end

data/index.html

@@ -14,7 +14,7 @@
   <title>Welcome to Foundation</title>
 
   <!-- Included CSS Files -->
-  <link rel="stylesheet" href="marketing/stylesheets/index.css">
+  <link rel="stylesheet" href="test/stylesheets/styles.css">
 
   <script src="vendor/assets/javascripts/foundation/modernizr.foundation.js"></script>
 

data/lib/foundation/version.rb

@@ -1,3 +1,3 @@
 module Foundation
-  VERSION = "3.0.8.rc1"
+  VERSION = "3.0.8"
 end

data/lib/zurb-foundation.rb

@@ -1,7 +1,7 @@
 root = File.join(File.dirname(__FILE__), "..")
 require "foundation/version"
 require "compass"
-# require "modular-scale"
+require "modular-scale"
 
 Compass::Frameworks.register("foundation",
   :stylesheets_directory => File.join(root,"scss"),

data/scss/foundation.scss

@@ -5,6 +5,8 @@
 
 @import "compass/css3";
 
+@import "modular-scale";
+
 @import "foundation/functions/all";
 
 @import "foundation/settings";

data/scss/foundation/_settings.scss

@@ -57,8 +57,10 @@ $complementaryWidth: 20% !default;
 
 // Modular Scale Settings
 
-$ratio: $golden !default;
-$base-size: 14px 44px !default;
+// $ratio: $golden; // THIS IS DEFAULT IN MODULAR-SCALE
+$baseFontSize: 14px !default;
+$importantModNum: 44px !default;
+$base-size: $baseFontSize $importantModNum;
 // Produced the following list of values: 14, 17, 23, 27, 37, 44, 59, 71, 95, 115;
 // http://www.modularscale.com by Tim Brown
 // https://github.com/scottkellum/modular-scale by scottkellum

data/scss/foundation/common/_base.scss

@@ -1,3 +1,4 @@
+@import "ratios";
 @import "globals";
 @import "typography";
 @import "forms";

data/scss/foundation/common/_forms.scss

@@ -56,7 +56,7 @@
 
   @media only screen and (max-width: $screenSmall - 1) {
     @for $i from 1 through $totalColumns {
-      input[type="text"].#{convert-number-to-word($i)}, textarea.#{convert-number-to-word($i)} { width: 100% !important; }
+      input[type="text"].#{convert-number-to-word($i)}, input[type="password"].#{convert-number-to-word($i)}, input[type="date"].#{convert-number-to-word($i)}, input[type="datetime"].#{convert-number-to-word($i)}, input[type="email"].#{convert-number-to-word($i)}, input[type="number"].#{convert-number-to-word($i)}, input[type="search"].#{convert-number-to-word($i)}, input[type="tel"].#{convert-number-to-word($i)}, input[type="time"].#{convert-number-to-word($i)}, input[type="url"].#{convert-number-to-word($i)}, textarea.#{convert-number-to-word($i)} { width: 100% !important; }
     }
   }
 

data/scss/foundation/common/_ratios.scss

@@ -0,0 +1,19 @@
+// Ratios
+$golden: 1.618;
+$gold: $golden;
+$double-octave: (4 / 1);
+$major-twelfth: (3 / 1);
+$major-eleventh: (8 / 3);
+$major-tenth: (5 / 2);
+$octave: (2 / 1);
+$major-seventh: (15 / 8);
+$minor-seventh: (16 / 9);
+$major-sixth: (5 / 3);
+$minor-sixth: (8 / 5);
+$fifth: (3 / 2);
+$augfourth: (1 / 1.4142135623730950488); // (1 / square root 2)
+$fourth: (4 / 3);
+$major-third: (5 / 4);
+$minor-third: (6 / 5);
+$major-second: (9 / 8);
+$minor-second: (16 / 15);

data/scss/foundation/components/_grid.scss

@@ -140,7 +140,26 @@ that IE7/8 do not support :nth-child.
 
   /* Mobile Block Grids */
   @media only screen and (max-width: $screenSmall - 1) {
-    .block-grid.mobile { margin-left: 0;
+    .block-grid.mobile {
       &>li { float: none; width: 100%; margin-left: 0; }
     }
+
+    .block-grid {
+      &>li { clear: none !important; }
+      &.mobile-two-up>li { width: 50%; 
+        &:nth-child(2n+1) { clear: both; }
+      }
+
+      &.mobile-three-up>li { width: 33.33%; 
+        &:nth-child(3n+1) { clear: both !important; }
+      }
+
+      &.mobile-four-up>li { width: 25%;
+        &:nth-child(4n+1) { clear: both; }
+      }
+
+      &.mobile-five-up>li {
+        &:nth-child(5n+1) { clear: both; }
+      }
+    }
   }

data/scss/foundation/functions/_all.scss

@@ -1,3 +1,2 @@
-@import "modular-scale";
 @import "convert-number-to-word";
 @import "grid-calc";

data/templates/project/index.html

@@ -121,27 +121,11 @@
 	
 	<!-- Included JS Files (Uncompressed) -->
 	<script src="javascripts/foundation/jquery.js"></script>
-  <script src="javascripts/foundation/jquery.foundation.reveal.js"></script>
-  <script src="javascripts/foundation/jquery.foundation.orbit.js"></script>
-  <script src="javascripts/foundation/jquery.foundation.forms.js"></script>
-  <script src="javascripts/foundation/jquery.placeholder.js"></script>
-  <script src="javascripts/foundation/jquery.foundation.tooltips.js"></script>
-  <script src="javascripts/foundation/jquery.foundation.alerts.js"></script>
-  <script src="javascripts/foundation/jquery.foundation.buttons.js"></script>
-  <script src="javascripts/foundation/jquery.foundation.accordion.js"></script>
-  <script src="javascripts/foundation/jquery.foundation.navigation.js"></script>
-  <script src="javascripts/foundation/jquery.foundation.mediaQueryToggle.js"></script>
-  <script src="javascripts/foundation/jquery.foundation.tabs.js"></script>
+	<% @template[:options][:javascripts].each do |f| %>
+	<script src="javascripts/<%= f %>"></script>
+	<% end %>
 	
-	<!-- Included JS Files (Compressed) -->
-	<!--
-	<script src="javascripts/jquery.min.js"></script>
-	<script src="javascripts/foundation.min.js"></script>
-	-->
-	
-	<!-- Application Javascript, safe to override -->
-	<script src="javascripts/foundation/app.js"></script>
-	
-
+  <!-- Application Javascript, safe to override -->
+  <script src="javascripts/foundation/app.js"></script>
 </body>
 </html>

data/templates/project/manifest.rb

@@ -5,7 +5,6 @@ stylesheet 'scss/_settings.scss',                         :to => '_settings.scss
 stylesheet 'scss/app.scss',                               :to => 'app.scss', :media => "screen, projector, print"
 
 # Make sure you list all the project template files here in the manifest.
-html 'index.html', :erb => true # use Foundation::VERSION
 file 'humans.txt'
 file 'robots.txt'
 file 'MIT-LICENSE.txt'
@@ -15,7 +14,8 @@ file 'MIT-LICENSE.txt'
 # outside the compass template
 def copy_images_from(relative_path, prefix_path)
   absolute_path = File.join(File.dirname(__FILE__), relative_path, prefix_path)
-  Dir.glob("#{absolute_path}/*.*") do |img|
+  img_files = Dir.glob("#{absolute_path}/*.*")
+  img_files.each do |img|
     image "#{relative_path}/#{prefix_path}/#{File.basename(img)}", 
       :to => "#{prefix_path}/#{File.basename(img)}"
   end
@@ -29,10 +29,22 @@ def copy_js_from(relative_path, prefix_path, excludes=[])
     javascript "#{relative_path}/#{prefix_path}/#{File.basename(js)}", 
       :to => "#{prefix_path}/#{File.basename(js)}"
   end
+  return js_files.map {|f| "#{prefix_path}/#{File.basename(f)}"}
 end
 
 copy_images_from("../../vendor/assets/images", "foundation/orbit")
-copy_js_from("../../vendor/assets/javascripts", "foundation", ["index.js"])
+javascripts = copy_js_from("../../vendor/assets/javascripts", "foundation", ["index.js"])
+
+javascripts.reject! do |f|   
+  [
+    "jquery.js",
+    "modernizr.foundation.js",
+    "app.js",
+    "jquery.offcanvas.js"
+  ].include?(File.basename(f))
+end
+
+html 'index.html', :erb => true, :javascripts => javascripts
 
 help %Q{
 

data/templates/project/scss/_settings.scss

@@ -1,4 +1,4 @@
-@import "foundation/functions/modular-scale";
+@import "foundation/common/ratios";
 
 // Settings file containing Foundation defaults
 
@@ -55,7 +55,8 @@
 
 // Modular Scale
 // $ratio: $golden;
-// $base-size: 14px 44px;
+// $baseFontSize: 14px;
+// $importantModNum: 44px;
 
 // Tooltip Settings
 // $hasTipBorderBottom: dotted 1px #ccc;

data/test/grid.html

@@ -524,7 +524,7 @@
           </ul>
 
           <h6>Five-up</h6>
-          <ul class="block-grid five-up">
+          <ul class="block-grid five-up mobile-three-up">
             <li>Five-up element</li>
             <li>Five-up element</li>
             <li>Five-up element</li>

data/test/scss/_settings.scss

@@ -1,5 +1,3 @@
-@import "foundation/functions/modular-scale";
-
 // Settings file containing Foundation defaults
 
 // Grid Settings
@@ -55,7 +53,8 @@
 
 // Modular Scale
 // $ratio: $golden;
-// $base-size: 14px 44px;
+$baseFontSize: 14px;
+$importantModNum: 44px;
 
 // Tooltip Settings
 // $hasTipBorderBottom: dotted 1px #ccc;

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

@@ -1,15 +1,15 @@
 (function ($){
-  
+
   $.fn.foundationAccordion = function (options) {
-    
-    $('.accordion li', this).on('click.fndtn', function () {
+
+    $(document).on('click.fndtn', '.accordion li', function () {
       var flyout = $(this).children('.content').first();
       $('.accordion .content').not(flyout).hide().parent('li').removeClass('active');
       flyout.show(0, function () {
         flyout.parent('li').addClass('active');
       });
     });
-        
+
   };
 
 })( jQuery );

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

@@ -1,33 +1,33 @@
 (function ($) {
-  
-  $.fn.foundationButtons = function(options) {    
+
+  $.fn.foundationButtons = function(options) {
     // Prevent event propagation on disabled buttons
-    $('.button.disabled', this).on('click.fndtn', function (event) {
-      event.preventDefault();
+    $(document).on('click.fndtn', '.button.disabled', function (e) {
+      e.preventDefault();
     });
-    
+
     $('.button.dropdown > ul', this).addClass('no-hover');
 
-    $('.button.dropdown, .button.dropdown.split span', this).on('click.fndtn', function (e) {
+    $(document).on('click.fndtn', '.button.dropdown, .button.dropdown.split span', function (e) {
       // Stops further propagation of the event up the DOM tree when clicked on the button.
       // Events fired by its descendants are not being blocked.
       if (e.target === this) {
         e.stopPropagation();
       }
     });
-    $('.button.dropdown.split span', this).on('click.fndtn', function (e) {
+    $(document).on('click.fndtn', '.button.dropdown.split span', function (e) {
       e.preventDefault();
       $('.button.dropdown', this).not($(this).parent()).children('ul').removeClass('show-dropdown');
       $(this).siblings('ul').toggleClass('show-dropdown');
     });
-    $('.button.dropdown', this).not('.split').on('click.fndtn', function (e) {
+    $(document).on('click.fndtn', '.button.dropdown:not(.split)', function (e) {
       $('.button.dropdown', this).not(this).children('ul').removeClass('show-dropdown');
       $(this).children('ul').toggleClass('show-dropdown');
     });
-    $('body, html').on('click.fndtn', function () {
+    $(document).on('click.fndtn', 'body, html', function () {
       $('.button.dropdown ul').removeClass('show-dropdown');
     });
-    
+
     // Positioning the Flyout List
     var normalButtonHeight  = $('.button.dropdown:not(.large):not(.small):not(.tiny)', this).outerHeight() - 1,
         largeButtonHeight   = $('.button.large.dropdown', this).outerHeight() - 1,
@@ -43,7 +43,7 @@
     $('.button.dropdown.up.large > ul', this).css('top', 'auto').css('bottom', largeButtonHeight - 2);
     $('.button.dropdown.up.small > ul', this).css('top', 'auto').css('bottom', smallButtonHeight - 2);
     $('.button.dropdown.up.tiny > ul', this).css('top', 'auto').css('bottom', tinyButtonHeight - 2);
-    
+
   };
 
 })( jQuery );

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

@@ -7,7 +7,7 @@
 */
 
 (function( $ ){
-  
+
   /**
    * Helper object used to quickly adjust all hidden parent element's, display and visibility properties.
    * This is currently used for the custom drop downs. When the dropdowns are contained within a reveal modal
@@ -39,25 +39,25 @@
       adjust : function( $child ) {
         // Internal reference.
         var _self = this;
-        
+
         // Set all hidden parent elements, including this element.
         _self.hidden = $child.parents().andSelf().filter( ":hidden" );
-        
+
         // Loop through all hidden elements.
         _self.hidden.each( function() {
-          
+
           // Cache the element.
           var $elem = $( this );
-          
+
           // Store the style attribute.
           // Undefined if element doesn't have a style attribute.
           _self.tmp.push( $elem.attr( 'style' ) );
-          
+
           // Set the element's display property to block,
           // but ensure it's visibility is hidden.
           $elem.css( { 'visibility' : 'hidden', 'display' : 'block' } );
         });
-      
+
       }, // end adjust
 
       /**
@@ -96,7 +96,7 @@
 
   jQuery.foundation = jQuery.foundation || {};
   jQuery.foundation.customForms = jQuery.foundation.customForms || {};
-  
+
   $.foundation.customForms.appendCustomMarkup = function ( options ) {
 
     var defaults = {
@@ -207,7 +207,7 @@
         // Insert the the currently selected list item before all other elements.
         // Then, find the element and assign it to $currentSelect.
         //
-        
+
         $currentSelect = $customSelect.prepend( '<a href="#" class="current">' + $selectedOption.html() + '</a>' ).find( ".current" );
         //
         // Add the custom select element after the <select> element.
@@ -260,7 +260,7 @@
           if ($currentSelect) {
             $currentSelect.html( $( this ).html() );
           }
-          
+
         }
 
       });
@@ -366,11 +366,9 @@
     var $input = $element.prev(),
         input = $input[0];
 
-    if (false == $input.is(':disabled')) {
+    if (false === $input.is(':disabled')) {
         input.checked = ((input.checked) ? false : true);
         $element.toggleClass('checked');
-
-        $input.trigger('change');
     }
   };
 
@@ -378,7 +376,7 @@
     var $input = $element.prev(),
         input = $input[0];
 
-    if (false == $input.is(':disabled')) {
+    if (false === $input.is(':disabled')) {
       $('input:radio[name="' + $input.attr('name') + '"]').each(function () {
         $(this).next().removeClass('checked');
       });
@@ -432,7 +430,7 @@
     event.preventDefault();
     $('div.dropdown').removeClass('open');
 
-    if (false == $select.is(':disabled')) {
+    if (false === $select.is(':disabled')) {
         $dropdown.toggleClass('open');
 
         if ($dropdown.hasClass('open')) {
@@ -477,9 +475,9 @@
     $select[0].selectedIndex = selectedIndex;
 
     $select.trigger('change');
-  });  
-  
-  
+  });
+
+
   $.fn.foundationCustomForms = $.foundation.customForms.appendCustomMarkup;
 
 })( jQuery );

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

@@ -2,12 +2,16 @@
   
   $.fn.foundationMediaQueryViewer = function (options) {
     
-    var settings  = $.extend(options,{toggleKey:77}); // Press 'M'
-    
-    $(document).keyup(function(e) {
+    var settings  = $.extend(options,{toggleKey:77}); // // Press 'M'
+    $(document).on("keyup.mediaQueryViewer", ":input", function(e){
+      if (e.which === settings.toggleKey) {
+        e.stopPropagation();
+      }
+    });
+    $(document).on("keyup.mediaQueryViewer", function(e) {
       var $mqViewer = $('#fqv');
 
-      if (e.keyCode == settings.toggleKey) { 
+      if (e.which === settings.toggleKey) { 
         if ($mqViewer.length > 0) {
           $mqViewer.remove();
         } else {

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

@@ -1,11 +1,11 @@
 (function ($){
-  
+
   $.fn.foundationNavigation = function (options) {
-    
+
     var lockNavBar = false;
     // Windows Phone, sadly, does not register touch events :(
     if (Modernizr.touch || navigator.userAgent.match(/Windows Phone/i)) {
-      $('.nav-bar a.flyout-toggle', this).on('click.fndtn touchstart.fndtn', function (e) {
+      $(document).on('click.fndtn touchstart.fndtn', '.nav-bar a.flyout-toggle', function (e) {
         e.preventDefault();
         var flyout = $(this).siblings('.flyout').first();
         if (lockNavBar === false) {
@@ -24,7 +24,7 @@
         $(this).children('.flyout').hide();
       });
     }
-    
+
   };
 
 })( jQuery );

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

@@ -14,11 +14,11 @@
   // Helps us determine if the current modal is being queued for display.
   //
   var modalQueued = false;
-  
+
   //
   // Bind the live 'click' event to all anchor elemnets with the data-reveal-id attribute.
   //
-  $( 'a[data-reveal-id]' ).live( 'click', function ( event ) {
+  $(document).on('click', 'a[data-reveal-id]', function ( event ) {
     //
     // Prevent default action of the event.
     //
@@ -219,11 +219,11 @@
         //
         modalBg.fadeTo( 'fast', 0.8 );
       }
-      
+
       //
       // Helper Methods
       //
-      
+
       /**
        * Unlock the modal for animation.
        *
@@ -241,7 +241,7 @@
       function lockModal() {
         locked = true;
       }
-      
+
       /**
        * Closes all open modals.
        *
@@ -265,7 +265,7 @@
           //
           $openModals.trigger( "reveal:close" );
         }
-      
+
       }
       /**
        * Animates the modal opening.
@@ -316,7 +316,7 @@
             // So, faster than the modal element.
             //
             modalBg.fadeIn( options.animationSpeed / 2 );
-            
+
             //
             // Let's delay the next animation queue.
             // We'll wait until the background element is faded in.
@@ -349,7 +349,7 @@
               // This should trigger the functions set in the options.opened property.
               //
               modal.trigger( 'reveal:opened' );
-            
+
             }); // end of animate.
 
           } // end if 'fadeAndPop'
@@ -406,7 +406,7 @@
               // This should trigger the functions set in the options.opened property.
               //
               modal.trigger( 'reveal:opened' );
-            
+
             });
 
           } // end if 'fade'
@@ -439,11 +439,11 @@
             // Trigger the modal opened event.
             //
             modal.trigger( 'reveal:opened' );
-          
+
           } // end if animating 'none'
-      
+
         }// end if !locked
-      
+
       }// end openAnimation
 
       //
@@ -489,7 +489,7 @@
               // Fade the modal out, by using the opacity property.
               //
               "opacity": 0
-            
+
             },
             /*
              * Fade speed.
@@ -503,7 +503,7 @@
               // Set the css hidden options.
               //
               modal.css( cssOpts.close );
-            
+
             });
             //
             // Is the modal animation queued?
@@ -541,13 +541,13 @@
               // This should trigger any method set in the options.closed propety.
               //
               modal.trigger( 'reveal:closed' );
-            
+
             } // end if !modalQueued
             //
             // Reset the modalQueued variable.
             //
             modalQueued = false;
-          
+
           } // end if animation 'fadeAndPop'
 
           //
@@ -609,9 +609,9 @@
               // This should trigger any method set in the options.closed propety.
               //
               modal.trigger( 'reveal:closed' );
-          
+
             } // end if !modalQueued
-          
+
           } // end if animation 'fade'
 
           //
@@ -637,11 +637,11 @@
             // This should trigger any method set in the options.closed propety.
             //
             modal.trigger( 'reveal:closed' );
-          
+
           } // end if not animating
 
         } // end if !locked
-      
+
       } // end closeAnimation
 
       /**
@@ -666,7 +666,7 @@
         // Unbind all .reveal events from the body.
         //
         $( 'body' ).unbind( '.reveal' );
-      
+
       }
 
       //
@@ -703,7 +703,7 @@
       // Handled by the options.closed property function.
       //
       modal.bind( 'reveal:closed.reveal', options.closed );
-      
+
       //
       // We're running this for the first time.
       // Trigger the modal 'open' event.
@@ -724,7 +724,7 @@
         modal.trigger( 'reveal:close' );
 
       });
-     
+
      //
      // Should we close the modal background on click?
      //
@@ -743,9 +743,9 @@
         // Trigger the modal 'close' event.
         //
         modal.trigger( 'reveal:close' );
-      
+
       });
-     
+
      }
 
      //
@@ -763,11 +763,11 @@
          //
          modal.trigger( 'reveal:close' );
        }
-      
+
       }); // end $(body)
 
     }); // end this.each
-  
+
   }; // end $.fn
 
 } ( jQuery ) );

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

@@ -1,11 +1,11 @@
 (function ($) {
-  
+
   $.fn.foundationTabs = function (options) {
-    
+
     var settings = $.extend({
       callback: $.noop
     }, options);
-    
+
     var activateTab = function ($tab) {
       var $activeTab = $tab.closest('dl').find('dd.active'),
           contentLocation = $tab.children('a').attr("href") + 'Tab';
@@ -21,16 +21,16 @@
       $(contentLocation).closest('.tabs-content').children('li').removeClass('active').hide();
       $(contentLocation).css('display', 'block').addClass('active');
     };
-    
-    $('dl.tabs dd a', this).on('click.fndtn', function (event){
+
+    $(document).on('click.fndtn', 'dl.tabs dd a', function (event){
       activateTab($(this).parent('dd'));
     });
-    
+
     if (window.location.hash) {
       activateTab($('a[href="' + window.location.hash + '"]').parent('dd'));
       settings.callback();
     }
-    
+
   };
 
 })(jQuery);

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zurb-foundation
 version: !ruby/object:Gem::Version
-  version: 3.0.8.rc1
-  prerelease: 6
+  version: 3.0.8
+  prerelease: 
 platform: ruby
 authors:
 - ZURB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0.alpha.244
+- !ruby/object:Gem::Dependency
+  name: modular-scale
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +106,7 @@ files:
 - scss/foundation/common/_base.scss
 - scss/foundation/common/_forms.scss
 - scss/foundation/common/_globals.scss
+- scss/foundation/common/_ratios.scss
 - scss/foundation/common/_typography.scss
 - scss/foundation/components/_grid.scss
 - scss/foundation/components/modules/_all.scss
@@ -103,7 +120,6 @@ files:
 - scss/foundation/functions/_all.scss
 - scss/foundation/functions/_convert-number-to-word.scss
 - scss/foundation/functions/_grid-calc.scss
-- scss/foundation/functions/_modular-scale.sass
 - scss/foundation/mixins/_all.scss
 - scss/foundation/mixins/_clearfix.scss
 - scss/foundation/mixins/_css-triangle.scss
@@ -177,13 +193,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3263140076592270617
+      hash: 2494856150602114202
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 2494856150602114202
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/scss/foundation/functions/_modular-scale.sass

@@ -1,332 +0,0 @@
-// SASSY MODULAR-SCALE
-// https://github.com/scottkellum/modular-scale
-
-@charset "UTF-8"
-
-// Ratios
-$golden: 1.618
-$gold: $golden
-$double-octave: (4 / 1)
-$major-twelfth: (3 / 1)
-$major-eleventh: (8 / 3)
-$major-tenth: (5 / 2)
-$octave: (2 / 1)
-$major-seventh: (15 / 8)
-$minor-seventh: (16 / 9)
-$major-sixth: (5 / 3)
-$minor-sixth: (8 / 5)
-$fifth: (3 / 2)
-$augfourth: (1 / 1.4142135623730950488) // (1 / square root 2)
-$fourth: (4 / 3)
-$major-third: (5 / 4)
-$minor-third: (6 / 5)
-$major-second: (9 / 8)
-$minor-second: (16 / 15)
-
-// Defaults
-// $ratio: $golden !default
-// $base-size: 16px !default
-$property: font-size !default
-$class-slug: ms !default
-
-// Modular Scale function
-@function modular-scale($multiple, $base-size, $ratio)
-  // return the $base-size if $multiple is zero
-  @if $multiple == 0
-    @if type-of($base-size) == 'list'
-      $base-size: sort-list($base-size)
-      @return nth($base-size, 1)
-    // return just the simple $base-size value if it's not a list
-    @return $base-size
-
-  // if multiple base-sizes are passed in as a list
-  // and multiple ratios are passed in as a list
-  // calculate values in using each base-size / ratio combination
-  @if type-of($base-size) == 'list' and type-of($ratio) == 'list'
-    @if unit(ms-multibase-multiratio($multiple, $base-size, $ratio)) == 'px'
-      @return round(ms-multibase-multiratio($multiple, $base-size, $ratio))
-    @return ms-multibase-multiratio($multiple, $base-size, $ratio)
-
-  // if multiple base-sizes are passed in as a list
-  // calculate values in using each base-size
-  @if type-of($base-size) == 'list' and type-of($ratio) == 'number'
-    @if unit(ms-multibase($multiple, $base-size, $ratio)) == 'px'
-      @return round(ms-multibase($multiple, $base-size, $ratio))
-    @return ms-multibase($multiple, $base-size, $ratio)
-
-  // if multiple ratios are passed in as a list
-  // calculate values in using each ratio
-  @if type-of($base-size) == 'number' and type-of($ratio) == 'list'
-    @if unit(ms-multiratio($multiple, $base-size, $ratio)) == 'px'
-      @return round(ms-multiratio($multiple, $base-size, $ratio))
-    @return ms-multiratio($multiple, $base-size, $ratio)
-
-  // If there are no lists just run the simple function
-  @if unit(exponent($ratio, $multiple) * $base-size) == 'px'
-    @return round(exponent($ratio, $multiple) * $base-size)
-  @return exponent($ratio, $multiple) * $base-size
-
-
-// calculate values in using each base-size / ratio combination
-@function ms-multibase-multiratio($multiple, $base-size, $ratio)
-  // start with an empty list to place all values in
-  $scale-values: ()
-  // make sure base sizes are in ascending order
-  $base-size: sort-list($base-size)
-  // take each base-size in turn
-  $k: 1
-  @while $k <= length($base-size)
-    // add each $base-size to the list except the first
-    @if $k > 1
-      $scale-values: append($scale-values, nth($base-size, $k))
-    // take each ratio in turn
-    $j: 1
-    @while $j <= length($ratio)
-      // reset $modular-scale for each set
-      $modular-scale: nth($base-size, $k)
-      // do the scale for each base-size using this ratio
-      @if $multiple > 0
-        // up $multiple times
-        // and add the result to $scale-values
-        @for $i from 1 through $multiple
-          $modular-scale: exponent(nth($ratio, $j), $i) * nth($base-size, $k)
-          $scale-values: append($scale-values, $modular-scale)
-        // and down until the value is lower than the lowest $base-size
-        // and add the result to $scale-values
-        $i: -1
-        $modular-scale: nth($base-size, $k)
-        @while $modular-scale >= nth($base-size, 1)
-          $modular-scale: exponent(nth($ratio, $j), $i) * nth($base-size, $k)
-          $scale-values: append($scale-values, $modular-scale)
-          $i: $i - 1
-      @if $multiple < 0
-        // do the scale down for each set to below 1px
-        $i: -1
-        $modular-scale: nth($base-size, $k)
-        @while $modular-scale > 1
-          $modular-scale: exponent(nth($ratio, $j), $i) * nth($base-size, $k)
-          $scale-values: append($scale-values, $modular-scale)
-          $i: $i - 1
-      $j: $j + 1
-    $k: $k + 1
-  // return trimmed and sorted final list
-  @return trim-sort($multiple, $scale-values, $base-size)
-
-
-// calculate values in using each base-size
-@function ms-multibase($multiple, $base-size, $ratio)
-  // start with an empty list to place all values in
-  $scale-values: ()
-  // make sure base sizes are in ascending order
-  $base-size: sort-list($base-size)
-  // take each base-size in turn
-  $k: 1
-  @while $k <= length($base-size)
-    // add each $base-size to the list except the first
-    @if $k > 1
-      $scale-values: append($scale-values, nth($base-size, $k))
-    // reset $modular-scale for each set
-    $modular-scale: nth($base-size, $k)
-    // do the scale for each base-size using this ratio
-    @if $multiple > 0
-      // up $multiple times
-      // and add the result to $scale-values
-      @for $i from 1 through $multiple
-        $modular-scale: exponent($ratio, $i) * nth($base-size, $k)
-        $scale-values: append($scale-values, $modular-scale)
-      // and down until the value is lower than the lowest $base-size
-      // and add the result to $scale-values
-      $i: -1
-      $modular-scale: nth($base-size, $k)
-      @while $modular-scale >= nth($base-size, 1)
-        $modular-scale: exponent($ratio, $i) * nth($base-size, $k)
-        $scale-values: append($scale-values, $modular-scale)
-        $i: $i - 1
-    @if $multiple < 0
-      // do the scale down for each set to below 1px
-      $i: -1
-      $modular-scale: nth($base-size, $k)
-      @while $modular-scale > 1
-        $modular-scale: exponent($ratio, $i) * nth($base-size, $k)
-        $scale-values: append($scale-values, $modular-scale)
-        $i: $i - 1
-    $k: $k + 1
-  // return trimmed and sorted final list
-  @return trim-sort($multiple, $scale-values, $base-size)
-
-
-// calculate values in using each ratio
-@function ms-multiratio($multiple, $base-size, $ratio)
-  // start with an empty list to place all values in
-  $scale-values: ()
-  // If $multiple is a positive integer (up the scale)
-  @if $multiple > 0
-    // take each ratio in turn
-    $j: 1
-    @while $j <= length($ratio)
-      // reset $modular-scale for each set
-      $modular-scale: $base-size
-      // do the scale using this ratio thru the multiple, and add the result to $scale-values
-      @for $i from 1 through $multiple
-        $modular-scale: exponent(nth($ratio, $j), $i) * $base-size
-        $scale-values: append($scale-values, $modular-scale)
-      $j: $j + 1
-    // sort acsending
-    $scale-values: sort-list($scale-values)
-    // return the final value using the laced list
-    @return nth($scale-values, $multiple)
-  // If $multiple is a negative integer (down the scale)
-  @if $multiple < 0
-    // take each ratio in turn
-    $j: 1
-    @while $j <= length($ratio)
-      // reset $modular-scale for each set
-      $modular-scale: $base-size
-      // do the scale using this ratio thru the multiple, and add the result to $scale-values
-      @for $i from 1 through ($multiple * -1)
-        $modular-scale: exponent(nth($ratio, $j), -$i) * $base-size
-        $scale-values: append($scale-values, $modular-scale)
-      $j: $j + 1
-    // sort decending
-    $scale-values: sort-list($scale-values, 'dec')
-    // return the final value using the laced list
-    @return nth($scale-values, $multiple * -1)
-
-
-// trim and sort the final list
-@function trim-sort($multiple, $scale-values, $base-size)
-  @if $multiple > 0
-    // trim list so we can count from the lowest $base-size
-    $scale-values: trim-list($scale-values, nth($base-size, 1))
-    // sort acsending
-    $scale-values: sort-list($scale-values)
-    // return the final value using the laced list
-    @return nth($scale-values, $multiple)
-  @else
-    // trim list so we can count from the lowest $base-size
-    $scale-values: trim-list($scale-values, nth($base-size, 1), 'dec')
-    // sort acsending
-    $scale-values: sort-list($scale-values, 'dec')
-    // return the final value using the laced list
-    @return nth($scale-values, -$multiple)
-
-
-/////////////////////////////////////////////////////////////////////////
-
-// Shortcut
-@function ms($multiple, $base-size, $ratio)
-  // Return the value from the Modular Scale function
-  @return modular-scale($multiple, $base-size, $ratio)
-
-// Classes Mixin
-=modular-scale-classes($multiple, $property, $class-slug, $base-size, $ratio)
-
-  // Loop from 0 through the value of $multiple and generate a range of classes
-  @for $i from 0 through $multiple
-    .#{$class-slug}-#{$i}
-      // Print the $property and return the value from the Modular Scale function
-      #{$property}: modular-scale($i, $base-size, $ratio)
-
-=ms-classes($multiple, $property, $class-slug, $base-size, $ratio)
-  +modular-scale-classes($multiple, $property, $class-slug, $base-size, $ratio)
-
-// Write Modular Scale List
-@function modular-scale-list($start: 0, $finish: 20, $base-size: $base-size, $ratio: $ratio)
-  $ms-list: unquote("MS-LIST:")
-  @for $i from $start through $finish
-    $ms-list: append($ms-list, ms($i, $base-size, $ratio))
-  @return $ms-list
-
-@function ms-list($start: 0, $finish: 20, $base-size: $base-size, $ratio: $ratio)
-  @return modular-scale-list($start, $finish, $base-size, $ratio)
-
-=modular-scale-list($start: 0, $finish: 20, $base-size: $base-size, $ratio: $ratio)
-  @debug modular-scale-list($start, $finish, $base-size, $ratio)
-
-=ms-list($start: 0, $finish: 20, $base-size: $base-size, $ratio: $ratio)
-  @debug modular-scale-list($start, $finish, $base-size, $ratio)
-
-/////////////////////////////////////////////////////////////////////////
-
-
-// Sass exponent support
-@function exponent($base, $exponent)
-  // reset value
-  $value: $base
-  // positive intergers get multiplied
-  @if $exponent > 1
-    @for $i from 2 through $exponent
-      $value: $value * $base
-  // negitive intergers get divided. A number divided by itself is 1
-  @if $exponent < 1
-    @for $i from 0 through -$exponent
-      $value: $value / $base
-  // return the last value written
-  @return $value
-
-
-// Sass list sorting support
-@function sort-list($list, $dir: 'asc')
-  // built-in list sorting in Sass would make this go away.
-  // declare some empty lists to put our new order and temporary values
-  $new-order: ()
-  $temp: ()
-  // fill $temp with the contents of $list
-  $temp: join($temp, $list)
-  // if sorting ascending
-  @if $dir == 'asc'
-    // loop through all values in $list
-    @for $i from 1 through length($list)
-      // impossibly high starter value to compare
-      $low: 1000000
-      // check for lowest value in $temp
-      @for $j from 1 through length($temp)
-        @if nth($temp, $j) < $low
-          $low: nth($temp, $j)
-      // add lowest value to $new-order
-      $new-order: append($new-order, $low)
-      // empty $temp for the next comparison
-      $temp: ()
-      // re-populate $temp with remaining values to sort
-      @for $k from 1 through length($list)
-        @if nth($list, $k) > $low
-          $temp: append($temp, nth($list, $k))
-  @if $dir == 'dec'
-    // loop through all values in $list
-    @for $i from 1 through length($list)
-      // 0 starter value
-      $high: 0
-      // check for highest value in $temp
-      @for $j from 1 through length($temp)
-        @if nth($temp, $j) > $high
-          $high: nth($temp, $j)
-      $new-order: append($new-order, $high)
-      // empty $temp for the next comparison
-      $temp: ()
-      // re-populate $temp with remaining values to sort
-      @for $k from 1 through length($list)
-        @if nth($list, $k) < $high
-          $temp: append($temp, nth($list, $k))
-  @return $new-order
-
-
-// Sass list trimming support
-@function trim-list($list, $start, $dir: 'asc')
-  // built-in list trimming in Sass would make this go away.
-  // declare some empty lists to put our trimmed values
-  $trimmed: ()
-  // if sorting ascending
-  @if $dir == 'asc'
-    // loop through all values in $list
-    @for $i from 1 through length($list)
-      @if nth($list, $i) >= $start
-        $trimmed: append($trimmed, nth($list, $i))
-  @if $dir == 'dec'
-    // loop through all values in $list
-    @for $i from 1 through length($list)
-      @if nth($list, $i) <= $start
-        $trimmed: append($trimmed, nth($list, $i))
-  @return $trimmed
-
-// Other libraries can easily query if this function is avalible
-$modular-scale-loaded: true