Merge branch 'master' of github.com:zurb/foundation

foundation · Jan 14, 2013 · c5d0ce6 · c5d0ce6
2 parents e414f60 + 4855b21
commit c5d0ce6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/scss/foundation/components/modules/_reveal.scss b/scss/foundation/components/modules/_reveal.scss
@@ -9,7 +9,7 @@
   .reveal-modal-bg { position: fixed; height: 100%; width: 100%; background: #000; background: rgba(#000, .45); z-index: 40; display: none; top: 0; #{$defaultFloat}: 0; }
 
   .reveal-modal { background: #fff; visibility: hidden; display: none; top: 100px; #{$defaultFloat}: 50%; margin-#{$defaultFloat}: -260px; width: 520px; position: absolute; z-index: 41; padding: 30px; @include box-shadow(0 0 10px rgba(#000,.4));
-    .close-reveal-modal {
+    .close-reveal-modal:not(.button) {
       @include font-size(22);
       line-height: .5;
       position: absolute;
@@ -30,6 +30,5 @@
     > :last-child { margin-bottom: 0; }
   }
   @media print {
-    div:not(.reveal-modal) { display: none; }
     .reveal-modal { border: solid 1px #000; background: #fff; }
   }
diff --git a/scss/foundation/components/modules/_topbar.scss b/scss/foundation/components/modules/_topbar.scss
@@ -27,7 +27,7 @@
   }
 
   /* <nav> */
-  .top-bar { background: $topBarBgColor; height: $topBarHeight; line-height: $topBarHeight; margin: 0 0 $topBarBtmMargin; padding: 0; width: 100%; position: relative;
+  .top-bar { background: $topBarBgColor; min-height: $topBarHeight; line-height: $topBarHeight; margin: 0 0 $topBarBtmMargin 0; padding: 0; width: 100%; position: relative;
 
     /* Contain width to .row width */
     .contain-to-grid & { max-width: $rowWidth; margin: 0 auto; } 

diff --git a/scss/foundation/mixins/_semantic-grid.scss b/scss/foundation/mixins/_semantic-grid.scss
@@ -17,9 +17,9 @@
   // Columns mixin, syntax is ($columns, $behavior). Behavior can be 'centered' which centers things or 'collapse' which collapses the gutters. ex @include row(4,[center | collapse])
 
   @mixin column($columns:$columns, $behavior: false) {
-      @if      $behavior == center   { @extend %fl-n; margin-left: auto; margin-right: auto; @extend %c-base; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: left; width: 100%; }
-    } @else if $behavior == collapse { @extend %fl-l; @extend %c-base; padding: 0; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: left; width: 100%; }
-    } @else                          { @extend %fl-l; @extend %c-base; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: left; width: 100%; } }
+      @if      $behavior == center   { @extend %fl-n; margin-left: auto; margin-right: auto; @extend %c-base; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: none; width: auto; }
+    } @else if $behavior == collapse { @extend %fl-l; @extend %c-base; padding: 0; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: none; width: auto; }
+    } @else                          { @extend %fl-l; @extend %c-base; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: none; width: auto; } }
   }
 
   // Offset Mixin, include after a column mixin to manipulate its grid offset.

diff --git a/vendor/assets/javascripts/foundation/jquery.foundation.topbar.js b/vendor/assets/javascripts/foundation/jquery.foundation.topbar.js
@@ -127,7 +127,7 @@
         // Put element back in the DOM
         settings.$section.appendTo(settings.$topbar);
       },
-      
+
       largestUL : function () {
         var uls = settings.$topbar.find('section ul ul'),
             largest = uls.first(),
@@ -154,17 +154,17 @@
       $.error('Method ' +  method + ' does not exist on jQuery.foundationTopBar');
     }
   };
-  
+
   // Monitor scroll position for sticky
   if ($('.sticky').length > 0) {
-    var distance = $('.sticky').offset().top,
+    var distance = $('sticky').length ? $('.sticky').offset().top: 0,
         $window = $(window);
-    
+
       $window.scroll(function() {
         if ( $window.scrollTop() >= distance ) {
            $(".sticky").addClass("fixed");
         }
-        
+
        else if ( $window.scrollTop() < distance ) {
           $(".sticky").removeClass("fixed");
        }