Fixed Scroll error in posts with no pictures

rancidfrog · Aug 29, 2014 · 08ad177 · 08ad177
1 parent e093a5a
commit 08ad177
Show file tree

Hide file tree

Showing 8 changed files with 564 additions and 39 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/_includes/head.html b/_includes/head.html
@@ -36,18 +36,12 @@
 
 
     <link href='http://fonts.googleapis.com/css?family=Montserrat:400,700|Open+Sans:400,600,300,800,700' rel='stylesheet' type='text/css'>
-	<link rel="stylesheet" href="{{ site.url }}/assets/css/font-awesome.min.css">
+	<link rel="stylesheet" href="{{ site.url }}/assets/css/vendor/font-awesome.min.css">
     <link rel="stylesheet" href="{{ site.url }}/assets/css/vendor/normalize.css">
+    <link rel="stylesheet" href="{{ site.url }}/assets/css/vendor/nprogress.css">
     <link rel="stylesheet" href="{{ site.url }}/assets/css/vendor/foundation.min.css">
     <link rel="stylesheet" href="{{ site.url }}/assets/css/style.css">
     <link rel="stylesheet" href="{{ site.url }}/assets/css/post.css">
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-    <script>window.jQuery || document.write('<script src="{{ site.url }}/assets/js/vendor/jquery-1.11.1.min.js"><\/script>')</script>
-    {% if page.chart %}
-    <!-- amCharts javascript sources -->
-    <script type="text/javascript" src="{{ site.url }}/assets/js/vendor/amcharts.js"></script>
-    <script type="text/javascript" src="http://cdn.amcharts.com/lib/3/pie.js"></script>
-    {% endif %}
 
 
 {% if page.mathjax %}

diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -1,12 +1,17 @@
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+    <script>window.jQuery || document.write('<script src="{{ site.url }}/assets/js/vendor/jquery-1.11.1.min.js"><\/script>')</script>
     <script src="{{ site.url }}/assets/js/vendor/modernizr.js"></script>
     <script src="{{ site.url }}/assets/js/foundation.min.js"></script>
-    <script src="{{ site.url }}/assets/js/vendor/background-check.js"></script>
-    <script src="{{ site.url }}/assets/js/vendor/post-header-animations.js"></script>
+    {% if page.imagefeature %}<script src="{{ site.url }}/assets/js/vendor/background-check.js"></script>
+    <script src="{{ site.url }}/assets/js/vendor/post-header-animations.js"></script>{% endif %}
     <script src="{{ site.url }}/assets/js/summer.js"></script>
+    <script src="{{ site.url }}/assets/js/vendor/nprogress.js"></script>
 
     <script>
       $(document).foundation();
     </script>
+    <script type='text/javascript'>console.log("HMFaysal Notepad Theme Version 2.0");</script>
+    <script type='text/javascript'>console.log("https://alum.mit.edu/www/hmfaysal");</script>
 
 {% if site.google_analytics %}
 <!-- Asynchronous Google Analytics snippet -->
@@ -21,4 +26,5 @@
   ga('send', 'pageview');
 
 </script>
-{% endif %}
+{% endif %}
+<script>NProgress.start();var interval=setInterval(function(){NProgress.inc()},1000);jQuery(window).load(function(){clearInterval(interval);NProgress.done()});jQuery(window).unload(function(){NProgress.start()});</script>
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -417,8 +417,6 @@ nav.pagination {
       .summer-tags-container .summer-tags-header {
         font-size: 1.5625rem; } }
 figure {
-    padding-top: 10px;
-    padding-bottom: 10px;
     margin: 0;
     *zoom: 1;
 }
@@ -469,9 +467,9 @@ figure a img:hover {
 @media only screen and (min-width:62.5em) {
     figure.half img {
         float: left;
-        width: 48%;
-        margin-right: 1%;
-        margin-left: 1%;
+        width: 49%;
+        margin-right: 0.5%;
+        margin-left: 0.5%;
     }
 
     figure.half figcaption {

diff --git a/assets/css/font-awesome.min.css → assets/css/vendor/font-awesome.min.css b/assets/css/font-awesome.min.css → assets/css/vendor/font-awesome.min.css
diff --git a/assets/css/vendor/nprogress.css b/assets/css/vendor/nprogress.css
@@ -0,0 +1,74 @@
+/* Make clicks pass-through */
+#nprogress {
+  pointer-events: none;
+}
+
+#nprogress .bar {
+  background: #e51843;
+
+  position: fixed;
+  z-index: 1031;
+  top: 0;
+  left: 0;
+
+  width: 100%;
+  height: 2px;
+}
+
+/* Fancy blur effect */
+#nprogress .peg {
+  display: block;
+  position: absolute;
+  right: 0px;
+  width: 100px;
+  height: 100%;
+  box-shadow: 0 0 10px #e51843, 0 0 5px #e51843;
+  opacity: 1.0;
+
+  -webkit-transform: rotate(3deg) translate(0px, -4px);
+      -ms-transform: rotate(3deg) translate(0px, -4px);
+          transform: rotate(3deg) translate(0px, -4px);
+}
+
+/* Remove these to get rid of the spinner */
+#nprogress .spinner {
+  display: block;
+  position: fixed;
+  z-index: 1031;
+  top: 15px;
+  right: 15px;
+}
+
+#nprogress .spinner-icon {
+  width: 18px;
+  height: 18px;
+  box-sizing: border-box;
+
+  border: solid 2px transparent;
+  border-top-color: #e51843;
+  border-left-color: #e51843;
+  border-radius: 50%;
+
+  -webkit-animation: nprogress-spinner 400ms linear infinite;
+          animation: nprogress-spinner 400ms linear infinite;
+}
+
+.nprogress-custom-parent {
+  overflow: hidden;
+  position: relative;
+}
+
+.nprogress-custom-parent #nprogress .spinner,
+.nprogress-custom-parent #nprogress .bar {
+  position: absolute;
+}
+
+@-webkit-keyframes nprogress-spinner {
+  0%   { -webkit-transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(360deg); }
+}
+@keyframes nprogress-spinner {
+  0%   { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+