Revert "Merge branch 'fixed-off-canvas' of git://github.com/brettsmason/foundation...

This reverts commit a730f625b49ec55f75fcd67926c9162d110aeb95, reversing
changes made to aad53b2e02fb439c42f41d7cd9643cd42872959f.

diff --git a/scss/components/_off-canvas.scss b/scss/components/_off-canvas.scss
index 495380951ca85cfa5a72035bc8032d5cab81396e..f9db0d0a59fa319f39e438913b6b61bd873c6703 100644 (file)
--- a/scss/components/_off-canvas.scss
+++ b/scss/components/_off-canvas.scss
@@ -50,9 +50,8 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5) !default;
 
   .off-canvas-wrapper {
     width: 100%;
-    height: 100%;
+    overflow-x: hidden;
     position: relative;
-    overflow: hidden;
     backface-visibility: hidden;
     -webkit-overflow-scrolling: auto;
   }
@@ -61,18 +60,17 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5) !default;
     @include clearfix;
     position: relative;
     width: 100%;
-    height: 100%;
+    min-height: 100%; 
     transition: transform $offcanvas-transition-length $offcanvas-transition-timing;
   }
 
   // Container for page content
   .off-canvas-content,
   .#{$maincontent-class} {
-    height: 100%;
+    min-height: 100%;
     background: $body-background;
     transition: transform $offcanvas-transition-length $offcanvas-transition-timing;
     backface-visibility: hidden;
-    overflow-y: auto;
     z-index: 1;
     padding-bottom: 0.1px; // Prevents margin collapsing, which would reveal the box shadow of the wrapper
 
@@ -101,7 +99,7 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5) !default;
   position: absolute;
   background: $offcanvas-background;
   z-index: $offcanvas-zindex;
-  height: 100%;
+  max-height: 100%;
   overflow-y: auto;
   transform: translateX(0);
 }