合并官方代码

halo-dev · Oct 17, 2018 · ce27102 · ce27102
1 parent 825b15a
commit ce27102
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 7 deletions.
diff --git a/assets/built/infinitescroll.js b/assets/built/infinitescroll.js
diff --git a/assets/built/infinitescroll.js.map b/assets/built/infinitescroll.js.map
diff --git a/assets/built/jquery.fitvids.js b/assets/built/jquery.fitvids.js
diff --git a/assets/built/jquery.fitvids.js.map b/assets/built/jquery.fitvids.js.map
diff --git a/assets/built/screen.css b/assets/built/screen.css
diff --git a/assets/built/screen.css.map b/assets/built/screen.css.map
diff --git a/assets/css/screen.css b/assets/css/screen.css
@@ -915,6 +915,10 @@ Usage (In Ghost editor):
     border-radius: 3px;
 }
 
+.post-full-content p code {
+    word-break: break-all;
+}
+
 .post-full-content pre {
     overflow-x: auto;
     margin: 1.5em 0 3em;
@@ -935,7 +939,7 @@ Usage (In Ghost editor):
     background: transparent;
 }
 
-.post-full-content pre code * {
+.post-full-content pre code :not(span) {
     color: inherit;
 }
 

diff --git a/category.ftl b/category.ftl
@@ -39,6 +39,6 @@
         // we reached the last page already.
         var maxPages = parseInt('${posts.totalPages}');
     </script>
-    <script src="/${themeName}/assets/js/infinitescroll.js"></script>
+    <script src="/${themeName}/assets/built/infinitescroll.js"></script>
     </#if>
 </@scripts>
diff --git a/default.ftl b/default.ftl
@@ -89,7 +89,7 @@
         integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
         crossorigin="anonymous">
     </script>
-    <script type="text/javascript" src="/${themeName}/assets/js/jquery.fitvids.js"></script>
+    <script type="text/javascript" src="/${themeName}/assets/built/jquery.fitvids.js"></script>
 </#macro>
 
 <#macro scripts>

diff --git a/index.ftl b/index.ftl
@@ -44,7 +44,7 @@ into the {body} of the default.hbs template -->
         // we reached the last page already.
         var maxPages = parseInt('${posts.totalPages}');
     </script>
-    <script src="/${themeName}/assets/js/infinitescroll.js"></script>
+    <script src="/${themeName}/assets/built/infinitescroll.js"></script>
     </#if>
     <#-- Ghost outputs important scripts and data with this tag - it should always be the very last thing before the closing body tag -->
     <#-- {{ghost_foot}} -->

diff --git a/tag.ftl b/tag.ftl
@@ -35,6 +35,6 @@
         // we reached the last page already.
         var maxPages = parseInt('${posts.totalPages}');
     </script>
-    <script src="/${themeName}/assets/js/infinitescroll.js"></script>
+    <script src="/${themeName}/assets/built/infinitescroll.js"></script>
     </#if>
 </@scripts>