-
Notifications
You must be signed in to change notification settings - Fork 564
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge pull request #328 from viosey/canary
- Loading branch information
Showing
86 changed files
with
4,682 additions
and
3,525 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,3 @@ | ||
| <% if(theme.comment.use === 'duoshuo') { %> | ||
| <!-- 使用多说评论 --> | ||
| <%- partial('_widget/duoshuo') %> | ||
| <% } %> | ||
|
|
||
| <% if(theme.comment.use === 'changyan') { %> | ||
| <!-- 使用 changyan --> | ||
| <div id="changyan-comment"> | ||
| <%- partial('_widget/changyan') %> | ||
| </div> | ||
| <style> | ||
| #changyan-comment{ | ||
| background-color: #eee; | ||
| padding: 2pc; | ||
| } | ||
| </style> | ||
| <% } %> | ||
|
|
||
| <% if(theme.comment.use === 'disqus') { %> | ||
| <!-- 使用 DISQUS --> | ||
| <div id="disqus-comment"> | ||
| <%- partial('_widget/disqus') %> | ||
| </div> | ||
| <style> | ||
| #disqus-comment{ | ||
| background-color: #eee; | ||
| padding: 2pc; | ||
| } | ||
| </style> | ||
| <% } %> | ||
|
|
||
| <% if(theme.comment.use === 'disqus_click') { %> | ||
| <!-- 使用 DISQUS_CLICK --> | ||
| <div id="disqus-comment"> | ||
| <%- partial('_widget/disqus_click') %> | ||
| </div> | ||
| <style> | ||
| #disqus-comment{ | ||
| background-color: #eee; | ||
| padding: 2pc; | ||
| } | ||
| </style> | ||
| <% } %> | ||
| <% if(theme.comment.use) { %> | ||
| <%- partial('_widget/comment/' + theme.comment.use + '/enter') %> | ||
| <% } %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <% if(theme.fonts.use === "google") { %> | ||
| <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"> | ||
| <link href="https://fonts.googleapis.com/icon?family=Material+Icons"rel="stylesheet"> | ||
| <% } else if(theme.fonts.use === "ustc") { %> | ||
| <link href="https://fonts.proxy.ustclug.org/css?family=Roboto:300,400,500" rel="stylesheet"> | ||
| <link href="https://fonts.proxy.ustclug.org/icon?family=Material+Icons"rel="stylesheet"> | ||
| <% } else if(theme.fonts.use === "custom") { %> | ||
| <link href="<%= theme.fonts.custom_font_host %>/css?family=Roboto:300,400,500" rel="stylesheet"> | ||
| <link href="<%= theme.fonts.custom_font_host %>/icon?family=Material+Icons"rel="stylesheet"> | ||
| <% } else if(theme.fonts.use === "baomitu") { %> | ||
| <style> | ||
| @font-face { | ||
| font-family: Roboto; | ||
| font-style: normal; | ||
| font-weight: 300; | ||
| src: url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-300.eot); | ||
| src: local('Roboto'),local('Roboto-Normal'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-300.eot?#iefix) format('embedded-opentype'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-300.woff2) format('woff2'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-300.woff) format('woff'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-300.ttf) format('truetype'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-300.svg#Roboto) format('svg') | ||
| } | ||
| @font-face { | ||
| font-family: Roboto; | ||
| font-style: normal; | ||
| font-weight: regular; | ||
| src: url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-regular.eot); | ||
| src: local('Roboto'),local('Roboto-Normal'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-regular.eot?#iefix) format('embedded-opentype'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-regular.woff2) format('woff2'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-regular.woff) format('woff'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-regular.ttf) format('truetype'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-regular.svg#Roboto) format('svg') | ||
| } | ||
| @font-face { | ||
| font-family: Roboto; | ||
| font-style: normal; | ||
| font-weight: 500; | ||
| src: url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-500.eot); | ||
| src: local('Roboto'),local('Roboto-Normal'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-500.eot?#iefix) format('embedded-opentype'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-500.woff2) format('woff2'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-500.woff) format('woff'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-500.ttf) format('truetype'),url(https://lib.baomitu.com/fonts/roboto/roboto-v15-latin-500.svg#Roboto) format('svg') | ||
| } | ||
| @font-face { | ||
| font-family: 'Material Icons'; | ||
| font-style: normal; | ||
| font-weight: 400; | ||
| src: url(https://lib.baomitu.com/material-design-icons/3.0.1/iconfont/MaterialIcons-Regular.eot); | ||
| src: url(https://lib.baomitu.com/material-design-icons/3.0.1/iconfont/MaterialIcons-Regular.woff2) format('woff2'),url(https://lib.baomitu.com/material-design-icons/3.0.1/iconfont/MaterialIcons-Regular.woff) format('woff'),url(https://lib.baomitu.com/material-design-icons/3.0.1/iconfont/MaterialIcons-Regular.ttf) format('truetype') | ||
| } | ||
| </style> | ||
| <% } %> |
Oops, something went wrong.