From 509c01f1b4005363566db41202f606f2ef6a3db9 Mon Sep 17 00:00:00 2001 From: Brandon Chong Date: Sat, 9 Apr 2016 02:36:25 -0500 Subject: [PATCH] got rid of flex boxes --- _layouts/sublime.html | 48 ++++++++++++++++++++--------------------- _sass/_sublime.scss | 4 ++-- css/main.scss | 2 +- js/sublime.js | 7 ++++-- libs/minimap/minimap.js | 4 ++-- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/_layouts/sublime.html b/_layouts/sublime.html index f1c9978..16e140a 100644 --- a/_layouts/sublime.html +++ b/_layouts/sublime.html @@ -5,35 +5,33 @@
-
diff --git a/_sass/_sublime.scss b/_sass/_sublime.scss index a43af9f..cb03261 100644 --- 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 index d9ba0c5..dc43c0b 100644 --- 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 index 67b1f01..0d5562e 100644 --- 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 index b13e9f2..0c346e6 100644 --- 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); };