got rid of flex boxes

bchong95 · Apr 9, 2016 · 509c01f · 509c01f
1 parent b80fbdf
commit 509c01f
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 32 deletions.
diff --git a/_layouts/sublime.html b/_layouts/sublime.html
@@ -5,35 +5,33 @@
 
   <body>
     <div class="row expanded">
-      <nav id="treeMenu" class="shrink columns show-for-large">
-        <div style="position:fixed">
-          <h1>Brandon Chong</h1>
-          <ul id="collections" class="treeview">
-            <a href="{{site.url}}">
-              <li>Portfolio</li>
-            </a>
-            {% for collection in site.collections %}
-              <li>
-                {{collection.label}}
-                {% if collection.docs.length != 0 %}
-                  <ul>
-                    {% for doc in collection.docs %}
-                      <a href="{{doc.permalink}}">
-                        <li>{{doc.title}}</li>
-                      </a>
-                    {% endfor %}
-                  </ul>
-                {% endif %}
-              </li>
-            {% endfor %}
-          </ul>
-        </div>
+      <nav id="treeMenu" class="large-2 columns show-for-large" >
+        <h1>Brandon Chong</h1>
+        <ul id="collections" class="treeview">
+          <a href="{{site.url}}">
+            <li>Portfolio</li>
+          </a>
+          {% for collection in site.collections %}
+            <li>
+              {{collection.label}}
+              {% if collection.docs.length != 0 %}
+                <ul>
+                  {% for doc in collection.docs %}
+                    <a href="{{doc.permalink}}">
+                      <li>{{doc.title}}</li>
+                    </a>
+                  {% endfor %}
+                </ul>
+              {% endif %}
+            </li>
+          {% endfor %}
+        </ul>
       </nav>
-      <main class="columns">
+      <main class="large-7 large-centered columns">
         {{content}}
         {% include footer.html %}
       </main>
-      <aside id="minimap" class="shrink columns show-for-large" >
+      <aside id="minimap" class="large-2 columns show-for-large" >
       </aside>
     </div>
     <!-- <script>$(document).foundation()</script> -->

diff --git a/_sass/_sublime.scss b/_sass/_sublime.scss
@@ -31,8 +31,8 @@ body {
 #treeMenu {
   background-color: $monokai-gray-light;
   color: $monokai-black;
-  // position:fixed;
-  // height:100%;
+  position:fixed;
+  height:100%;
 }
 
 h2,h3,h4,h5,h6 {

diff --git a/css/main.scss b/css/main.scss
@@ -9,5 +9,5 @@
   "sublime"
 ;
 html {
-  @include foundation-everything(true);
+  @include foundation-everything(false);
 }
diff --git a/js/sublime.js b/js/sublime.js
@@ -104,10 +104,13 @@
   ddtreemenu.createTree("collections", false)
   ddtreemenu.flatten('collections', 'expand')
   $("#collections").css("padding-left", "5%")
-  $("#treeMenu").width($("#collections").width() * 1.2)
+  // $("#treeMenu").width($("#collections").width() * 1.2)
 })();
 
 // Sets up the mini map
 (function () {
-  $('main').minimap()
+  // Only add minimap is needed
+  if ($("body").height() > $(window).height()) {
+    $('main').minimap()
+  }
 })();
diff --git a/libs/minimap/minimap.js b/libs/minimap/minimap.js
@@ -157,8 +157,8 @@ SOFTWARE.
             cssRegion[settings.position] = offsetLeftRight + 'px';
             region.css(cssRegion);
 
-            // Hack to make foundation grid responsive
-            $("#minimap").width(region.width() * 1.5)
+            // // Hack to make foundation grid responsive
+            // $("#minimap").width(region.width() * 1.5)
             settings.onPreviewChange(miniElement, s);
         };