Remove blend, Fix jekyll page.layout, Add async fonts

arshadlrn · Mar 26, 2016 · 379f457 · 379f457
1 parent c0a7958
commit 379f457
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 30 deletions.
diff --git a/_includes/facebook.html b/_includes/facebook.html
@@ -1,3 +1,3 @@
-{% if page.route == 'index' %}
+{% if page.layout == 'index' %}
   <div id="fb-root"></div>
-{% endif %}
+{% endif %}
diff --git a/_includes/header.html b/_includes/header.html
@@ -13,7 +13,7 @@
       </a>
     </p>
 
-    {% unless page.route == 'index' %}
+    {% unless page.layout == 'index' %}
       {% include share.html %}
     {% endunless %}
   </div>

diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -1,6 +1,18 @@
-<script type="text/javascript">
+<script type="text/javascript" src="/javascript/jquery-1.11.1.min.js"></script>
+<script type="text/javascript" src="/javascript/codemirror.js"></script>
+<script type="text/javascript" src="/javascript/mode/xml/xml.js"></script>
+<script type="text/javascript" src="/javascript/mode/htmlmixed/htmlmixed.js"></script>
+
+<script type="text/javascript" src="/javascript/marksheet.js"></script>
+
+{% if page.layout == 'post' %}
+  <script type="text/javascript" src="/javascript/affix.js"></script>
+  <script type="text/javascript" src="/javascript/post.js"></script>
+{% endif %}
+
+<script async type="text/javascript">
   WebFontConfig = {
-    google: { families: [ 'Source+Sans+Pro:400,300,700,400italic,700italic:latin', 'Source+Code+Pro::latin' ] ] }
+    google: { families: [ 'Source+Sans+Pro:400,300,700,400italic,700italic:latin', 'Source+Code+Pro::latin' ] }
   };
   (function() {
     var wf = document.createElement('script');
@@ -12,15 +24,3 @@
     s.parentNode.insertBefore(wf, s);
   })();
 </script>
-
-<script type="text/javascript" src="/javascript/jquery-1.11.1.min.js"></script>
-<script type="text/javascript" src="/javascript/codemirror.js"></script>
-<script type="text/javascript" src="/javascript/mode/xml/xml.js"></script>
-<script type="text/javascript" src="/javascript/mode/htmlmixed/htmlmixed.js"></script>
-
-<script type="text/javascript" src="/javascript/marksheet.js"></script>
-
-{% if page.route == 'post' %}
-  <script type="text/javascript" src="/javascript/affix.js"></script>
-  <script type="text/javascript" src="/javascript/post.js"></script>
-{% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="route-{{ page.route }}{% if page.section %} section-{{ page.section }}{% endif %}">
+<html class="route-{{ page.route }} route-{{ page.layout }}{% if page.section %} section-{{ page.section }}{% endif %}">
   {% include head.html %}
   <body>
     {% include facebook.html %}
@@ -9,7 +9,7 @@
       {{ content }}
     </div>
     {% include footer.html %}
-    {% if page.route == 'post' %}
+    {% if page.layout == 'post' %}
       <div id="overlay" class="page-overlay"></div>
       <div class="page-menu">
         {% include table-of-contents.html %}

diff --git a/_sass/components.sass b/_sass/components.sass
@@ -3,16 +3,17 @@
   background-color: $hero-3
   background-image: linear-gradient(142deg, $hero-1, $hero-2 31%, $hero-3 65%, $hero-4)
   position: fixed
-  &:after
-    +overlay
-    background: rgba(black, .1)
-    content: ""
-    display: block
-    mix-blend-mode: multiply
+
+.page-hero-pattern
+  +overlay
+  background: rgba(black, .1)
+  content: ""
+  display: block
+  mix-blend-mode: multiply
+  opacity: 0
   +from(700px)
-    &:after
-      background: url("/images/pattern.png") repeat
-      mix-blend-mode: multiply
+    background: url("/images/pattern.png") repeat
+    mix-blend-mode: multiply
 
 .page-body
   position: relative

diff --git a/_sass/elements.sass b/_sass/elements.sass
@@ -356,7 +356,7 @@
         +desktop
           margin: 0
           width: 20%
-  div.highlight
+  figure.highlight
     margin: 30px -30px
     overflow: auto
     pre code

diff --git a/css/ie.css b/css/ie.css
@@ -1,3 +1,3 @@
-.page-hero:after {
+.page-hero-pattern {
   display: none;
 }