1.2.6 #121
Merged
1.2.6 #121
Conversation
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
Canary 1.2.5
…104) * Add bilibili, changed config * Update footer-left.ejs * Improve the way of openning a new windows from SNS
Update _config.yml
Canary Sync
Edit blog_info.ejs to avoid href is null instead of update _config.yml
Update from source
Pull canary
Feat/telegram
Pr Canary from viosey branch
fixed view_window to _blank
fix(lang): minor improvements for french
fix(lang): minor improvements for english
refactor(sns): simplify conditional display
pidupuis
requested changes
Jan 12, 2017
| @@ -6,7 +6,7 @@ | |||
|
|
|||
| <!-- LOGO --> | |||
| <div class="something-else-logo mdl-color--white mdl-color-text--grey-600"> | |||
| <a href="<%= theme.url.logo %>"> | |||
| <a href="<% if(theme.url.logo !=null) { %> <%= theme.url.logo %> <% } else { %> # <% } %>"> | |||
There was a problem hiding this comment.
I would have written:
<a href="<%= theme.url.logo || '#' %>">
which is prettier, covers every falsy value and uses strict equality
| @@ -13,7 +13,7 @@ | |||
| <div id="comments"> | |||
| <!-- 多说评论框 start --> | |||
| <div class="ds-thread" | |||
| data-thread-key="<% if(theme.comment.duoshuo_thread_key == "id"){ %><%= page.id %><% } else { %><%= page.path %><% } %>" | |||
| data-thread-key="<% if(theme.comment.duoshuo_thread_key_type == "id"){ %><%= page.id %><% } else { %><%= page.path %><% } %>" | |||
There was a problem hiding this comment.
I would have written:
data-thread-key="<% theme.comment.duoshuo_thread_key_type === 'id' ? page.id : page.path %>"
which is less verbose and uses strict equality
| @@ -425,7 +426,7 @@ a { | |||
| border-radius: 3px; | |||
| } | |||
| #post-content.markdown-Github code { | |||
There was a problem hiding this comment.
Remove the block since it is empty now
cubesky
requested changes
Jan 13, 2017
added 5 commits
January 13, 2017 14:40
`data-thread-key="<% theme.comment.duoshuo_thread_key_type === 'id' ? page.id : page.path %>"`
instead of
`data-thread-key="<% if(theme.comment.duoshuo_thread_key_type == "id"){%><%= page.id %><% } else { %><%= page.path %><% } %>" `
feat(pages): allow page icons in sidebar
refactor(url): improve logo url decision making
refactor(duoshuo): improve thread key statement
pidupuis
approved these changes
Jan 13, 2017
style(markdown): remove .markdown-Github code block
neoFelhz
requested changes
Jan 13, 2017
style(all): beautify code
refactor(sns): add two default icons
|
Footer icon bug fixed |
cubesky
approved these changes
Jan 13, 2017
neoFelhz
approved these changes
Jan 13, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New features
Changes
duoshuo_thread_key->duoshuo_thread_key_typerefactor(duoshuo): change duoshuo_thread_key to duoshuo_thread_key_type #105no-wrapstyle of.markdown-Github codeBugs fixed