Skip to content

Commit ce27102

Browse files
committed
合并官方代码
1 parent 825b15a commit ce27102

File tree

11 files changed

+16
-7
lines changed

11 files changed

+16
-7
lines changed

assets/built/infinitescroll.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/built/infinitescroll.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/built/jquery.fitvids.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/built/jquery.fitvids.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/built/screen.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/built/screen.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/screen.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,10 @@ Usage (In Ghost editor):
915915
border-radius: 3px;
916916
}
917917

918+
.post-full-content p code {
919+
word-break: break-all;
920+
}
921+
918922
.post-full-content pre {
919923
overflow-x: auto;
920924
margin: 1.5em 0 3em;
@@ -935,7 +939,7 @@ Usage (In Ghost editor):
935939
background: transparent;
936940
}
937941

938-
.post-full-content pre code * {
942+
.post-full-content pre code :not(span) {
939943
color: inherit;
940944
}
941945

category.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@
3939
// we reached the last page already.
4040
var maxPages = parseInt('${posts.totalPages}');
4141
</script>
42-
<script src="/${themeName}/assets/js/infinitescroll.js"></script>
42+
<script src="/${themeName}/assets/built/infinitescroll.js"></script>
4343
</#if>
4444
</@scripts>

default.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
9090
crossorigin="anonymous">
9191
</script>
92-
<script type="text/javascript" src="/${themeName}/assets/js/jquery.fitvids.js"></script>
92+
<script type="text/javascript" src="/${themeName}/assets/built/jquery.fitvids.js"></script>
9393
</#macro>
9494

9595
<#macro scripts>

index.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ into the {body} of the default.hbs template -->
4444
// we reached the last page already.
4545
var maxPages = parseInt('${posts.totalPages}');
4646
</script>
47-
<script src="/${themeName}/assets/js/infinitescroll.js"></script>
47+
<script src="/${themeName}/assets/built/infinitescroll.js"></script>
4848
</#if>
4949
<#-- Ghost outputs important scripts and data with this tag - it should always be the very last thing before the closing body tag -->
5050
<#-- {{ghost_foot}} -->

0 commit comments

Comments
 (0)