From: Kevin Chu <kwhchu@users.noreply.github.com>
Date: Mon, 8 May 2017 16:40:31 +0000 (-0700)
Subject: Fix conflicts
X-Git-Tag: v6.4.0-rc1~46^2~56^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a0c04f57e3e308481b4426b000ab55d588bec56;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fix conflicts
---

diff --git a/docs/assets/scss/docs.scss b/docs/assets/scss/docs.scss
index 0304c54c1..0e9ae8f25 100644
--- a/docs/assets/scss/docs.scss
+++ b/docs/assets/scss/docs.scss
@@ -157,12 +157,3 @@ a#notice {
   }
 }
 
-.off-canvas {
-  z-index: 2;
-}
-
-.off-canvas-content {
-  height: 100vh;
-  overflow: hidden;
-}
-
diff --git a/docs/layout/default.html b/docs/layout/default.html
index 5da1b8c78..09e3fbd85 100644
--- a/docs/layout/default.html
+++ b/docs/layout/default.html
@@ -30,36 +30,40 @@
     </div>
   </a> -->
 
-  <div class="off-canvas-wrapper"><div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
-    {{> off-canvi}}
-  </div></div>
+  <div class="off-canvas-wrapper">
+    <div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
+      {{> off-canvi}}
+    </div>
 
-  <div class="off-canvas-content" data-off-canvas-content>
-    <!-- Info Banner For Announcements or Links -->
-    <!-- <a href="http://zurb.com/article/1416/foundation-6-is-here" id="notice">
-      <div class="info">
-        <h5>Foundation 6 is here!</h5>
+    <div class="docs-off-canvas-content off-canvas-content" data-off-canvas-content>
+      <!-- Info Banner For Announcements or Links -->
+      <!-- <a href="http://zurb.com/article/1416/foundation-6-is-here" id="notice">
+        <div class="info">
+          <h5>Foundation 6 is here!</h5>
+        </div>
+      </a> -->
+ 
+      <div class="docs-sticky-top-bar"> 
+        {{> navigation}}
+        {{> mobile-navigation}}
+        {{> search-bar}}
       </div>
-    </a> -->
-
-    {{> navigation}}
-    {{> mobile-navigation}}
-    {{> search-bar}}
-
-
-    <div class="collapse expanded row">
-      <div id="body-container" class="small-12 medium-9 large-10 medium-push-3 large-push-2 columns">
-<!-- do not indent -->
+  
+  
+      <div class="collapse expanded row">
+        <div id="body-container" class="small-12 medium-9 large-10 medium-push-3 large-push-2 columns">
+  <!-- do not indent -->
 {{> body}}
-      </div>
-      <div class="medium-3 large-2 medium-pull-9 large-pull-10 hide-for-small-only columns" data-sticky-container>
-        <div class="docs-nav-container" data-sticky data-anchor="body-container">
-          {{> component-list}}
+        </div>
+        <div class="medium-3 large-2 medium-pull-9 large-pull-10 hide-for-small-only columns" data-sticky-container>
+          <div class="docs-nav-container" data-sticky data-anchor="body-container">
+            {{> component-list}}
+          </div>
         </div>
       </div>
+  
+      {{> footer}}
     </div>
-
-    {{> footer}}
   </div>
 
   <script>