fix(cache): add Font-Awesome fonts

iblh · Apr 17, 2017 · 0b4e02f · 0b4e02f
1 parent bcae160
commit 0b4e02f
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 54 deletions.
diff --git a/layout/_partial/Paradox-post-thumbnail.ejs b/layout/_partial/Paradox-post-thumbnail.ejs
@@ -1,4 +1,4 @@
-<script type="text/ls-javascript" id="thumbnail-script">
+<script type="text/ls-javascript" id="post-thumbnail-script">
     var randomNum = Math.floor(Math.random() * <%= theme.thumbnail.random_amount %> + 1);
 
     $('.post_thumbnail-random').attr('data-original', '<%= theme.img.random_thumbnail %>' + randomNum + '.png');

diff --git a/layout/_partial/config_css.ejs b/layout/_partial/config_css.ejs
@@ -15,6 +15,14 @@
     src: url(<%- config.root %>fonts/MaterialIcons-Regular.woff2) format('woff2'), url(<%- config.root %>fonts/MaterialIcons-Regular.woff) format('woff'), url(<%- config.root %>fonts/MaterialIcons-Regular.ttf) format('truetype')
   }
 
+  @font-face {
+    font-family: 'FontAwesome';
+    src: url(<%- config.root %>fonts/fontawesome-webfont.eot?v=4.5.0);
+    src: url(<%- config.root %>fonts/fontawesome-webfont.eot?#iefix&v=4.5.0) format('embedded-opentype'), url(../fonts/fontawesome-webfont.woff2?v=4.5.0) format('woff2'), url(../fonts/fontawesome-webfont.woff?v=4.5.0) format('woff'), url(../fonts/fontawesome-webfont.ttf?v=4.5.0) format('truetype'), url(../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular) format('svg');
+    font-weight: 400;
+    font-style: normal
+  }
+
   a {
     color: <%= theme.uiux.hyperlink_color %>;
   }

diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
@@ -99,7 +99,7 @@
         <% } %>
     <![endif]-->
 
-    <%- jsHex('js/lsloader') %>
+    <%- jsHex('js/lsloader.min') %>
 
     <!-- Import CSS & jQuery -->
     <% if(theme.materialcdn.use === true) { %>

diff --git a/layout/_partial/import_js.ejs b/layout/_partial/import_js.ejs
@@ -12,7 +12,7 @@
 
 <% if( theme.js_effect.smoothscroll === true ) { %>
     <% if(theme.materialcdn.use === true) { %>
-        j<%- sLsload(theme.materialcdn.base + "/js/smoothscroll.js") %>
+        <%- jsLsload(theme.materialcdn.base + "/js/smoothscroll.js") %>
     <%}else{%>
         <%- jsLsload('js/smoothscroll') %>
     <%}%>
@@ -30,7 +30,7 @@
     <% if( theme.search.use === 'local' ) { %>
         <%- partial('_widget/search-local-js') %>
 
-        <script type="text/ls-javascript" id="search-input">
+        <script type="text/ls-javascript" id="search-input-script">
             var inputArea = document.querySelector('#search');
             var getSearchFile = function() {
                 var path = '<%= config.search.path %>';
@@ -47,30 +47,6 @@
 <% } %>
 
 <!-- UC Browser Compatible -->
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> viosey/canary
-=======
->>>>>>> viosey/canary
-=======
->>>>>>> viosey/canary
-=======
->>>>>>> viosey/canary
-<script>
-    var agent = navigator.userAgent.toLowerCase();
-    if(agent.indexOf('ucbrowser')>0) {
-        document.write("<%- css('css/uc').replace(/\"/g,"\\\"") %>");
-        alert('由于 UC 浏览器使用极旧的内核，而本网站使用了一些新的特性。\n为了您能更好的浏览，推荐使用 Chrome 或 Firefox 浏览器。');
-    }
-</script>
-
-<!-- Window Load-->
->>>>>>> viosey/canary
 <script>
     var agent = navigator.userAgent.toLowerCase();
     if(agent.indexOf('ucbrowser')>0) {

diff --git a/source/css/style.css b/source/css/style.css
@@ -2648,25 +2648,6 @@ a {
     }
 }
 
-
-
-
-
-/****************/
-/* Font_Awesome */
-/****************/
-/*!
- *  Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-
-@font-face {
-    font-family: 'FontAwesome';
-    src: url(../fonts/fontawesome-webfont.eot?v=4.5.0);
-    src: url(../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0) format('embedded-opentype'), url(../fonts/fontawesome-webfont.woff2?v=4.5.0) format('woff2'), url(../fonts/fontawesome-webfont.woff?v=4.5.0) format('woff'), url(../fonts/fontawesome-webfont.ttf?v=4.5.0) format('truetype'), url(../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular) format('svg');
-    font-weight: 400;
-    font-style: normal
-}
 .fa {
     font: normal normal normal 14px/1 FontAwesome;
     font-size: inherit;

diff --git a/source/css/style.min.css b/source/css/style.min.css
diff --git a/source/js/lsloader.js b/source/js/lsloader.js
@@ -383,6 +383,7 @@
         this.runjs();
     }
 
-})()/**
- * Created by yanghuanyu on 16/3/19.
+})()/** !
+ * Created by EYHN on 2017/4/17.
+ * 修改自 sexdevil/LSLoader https://github.com/sexdevil/LSLoader
  */
diff --git a/source/js/lsloader.min.js b/source/js/lsloader.min.js