Skip to content

Commit

Permalink
代码缩进统一,评论可开关 #139
Browse files Browse the repository at this point in the history
  • Loading branch information
nexmoe committed Jul 25, 2021
1 parent 21a629b commit faf4240
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 108 deletions.
18 changes: 9 additions & 9 deletions layout/_partial/copyright.ejs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<% if (page.hide_copyright !== true && theme.copyright || page.copyright) { %>
<div class="nexmoe-post-copyright">
<strong><%- __('copyright.author') %></strong><%= config.author %><br>
<strong><%- __('copyright.permalink') %></strong><%- link_to(page.permalink, page.permalink, {external: true}) %><br>
<% if (page.copyright) { %>
<%- page.copyright %>
<% } else { %>
<%- theme.copyright %>
<% } %>
</div>
<div class="nexmoe-post-copyright">
<strong><%- __('copyright.author') %></strong><%= config.author %><br>
<strong><%- __('copyright.permalink') %></strong><%- link_to(page.permalink, page.permalink, {external: true}) %><br>
<% if (page.copyright) { %>
<%- page.copyright %>
<% } else { %>
<%- theme.copyright %>
<% } %>
</div>
<% } %>
10 changes: 5 additions & 5 deletions layout/_partial/paginator.ejs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<% if (page.total > 1){ %>
<nav class="nexmoe-page-nav">
<%- paginator({
prev_text: '<i class="nexmoefont icon-left"></i>',
next_text: '<i class="nexmoefont icon-right"></i>',
escape: false
}) %>
<%- paginator({
prev_text: '<i class="nexmoefont icon-left"></i>',
next_text: '<i class="nexmoefont icon-right"></i>',
escape: false
}) %>
</nav>
<% } %>
6 changes: 3 additions & 3 deletions layout/_partial/sidebar.ejs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<aside id="nexmoe-sidebar">
<% theme.widgets.forEach(function(widget){ %>
<%- partial('_widget/' + widget) %>
<% }) %>
<% theme.widgets.forEach(function(widget){ %>
<%- partial('_widget/' + widget) %>
<% }) %>
</aside>
136 changes: 68 additions & 68 deletions layout/layout.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,85 +3,85 @@
<html <% if (config.language) { %>lang="<%- config.language %>"<% } %>>

<head>
<%
var title = page.title;
<%
var title = page.title;
if (is_archive()){
title = __('archive');
if (is_archive()){
title = __('archive');
if (is_month()){
title += '' + page.year + '/' + page.month;
} else if (is_year()){
title += '' + page.year;
if (is_month()){
title += '' + page.year + '/' + page.month;
} else if (is_year()){
title += '' + page.year;
}
} else if (is_category()){
title = __('count.categories') + '' + page.category;
} else if (is_tag()){
title = __('count.tags') + '' + page.tag;
}
} else if (is_category()){
title = __('count.categories') + '' + page.category;
} else if (is_tag()){
title = __('count.tags') + '' + page.tag;
}
%>
<title><% if (title){ %><%= title %> - <% } %><%= config.title %></title>
<meta charset="UTF-8">
<meta name="description" content="<%= config.description %>">
<meta name="keywords" content="<%= config.keywords %>">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5">
<%- partial('_partial/_analytics/gtm-head') %>
<%- partial('_partial/site-verification') %>
<link rel="shortcut icon" href="<%= theme.favicon.href %>" type="<%= theme.favicon.type %>" />
<%- open_graph({twitter_id: theme.twitter, google_plus: theme.google_plus, fb_admins: theme.fb_admins, fb_app_id: theme.fb_app_id}) %>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/combine/npm/highlight.js@9.15.8/styles/atom-one-dark.css,npm/justifiedGallery@3.8.1/dist/css/justifiedGallery.min.css,gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css,npm/hexo-theme-nexmoe@latest/source/lib/mdui_043tiny/css/mdui.css,npm/hexo-theme-nexmoe@latest/source/lib/iconfont/iconfont.css?v=233" crossorigin>
<%- css_auto_version('css/style') %>
<% if (theme.iconlib) { %>
<link rel="stylesheet" href="<%= theme.iconlib %>">
<% } %>
<%- css_auto_version('lib/iconfont/iconfont.css') %>
%>
<title><% if (title){ %><%= title %> - <% } %><%= config.title %></title>
<meta charset="UTF-8">
<meta name="description" content="<%= config.description %>">
<meta name="keywords" content="<%= config.keywords %>">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5">
<%- partial('_partial/_analytics/gtm-head') %>
<%- partial('_partial/site-verification') %>
<link rel="shortcut icon" href="<%= theme.favicon.href %>" type="<%= theme.favicon.type %>" />
<%- open_graph({twitter_id: theme.twitter, google_plus: theme.google_plus, fb_admins: theme.fb_admins, fb_app_id: theme.fb_app_id}) %>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/combine/npm/highlight.js@9.15.8/styles/atom-one-dark.css,npm/justifiedGallery@3.8.1/dist/css/justifiedGallery.min.css,gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css,npm/hexo-theme-nexmoe@latest/source/lib/mdui_043tiny/css/mdui.css,npm/hexo-theme-nexmoe@latest/source/lib/iconfont/iconfont.css?v=233" crossorigin>
<%- css_auto_version('css/style') %>
<% if (theme.iconlib) { %>
<link rel="stylesheet" href="<%= theme.iconlib %>">
<% } %>
<%- css_auto_version('lib/iconfont/iconfont.css') %>
</head>

<body class="mdui-drawer-body-left">
<%- partial('_partial/_analytics/gtm-body') %>
<div id="nexmoe-background">
<div class="nexmoe-bg" style="background-image: url(<%= theme.background.path %>)"></div>
<div class="mdui-appbar mdui-shadow-0">
<div class="mdui-toolbar">
<a mdui-drawer="{target: '#drawer', swipe: true}" title="menu" class="mdui-btn mdui-btn-icon mdui-ripple"><i class="mdui-icon nexmoefont icon-menu"></i></a>
<div class="mdui-toolbar-spacer"></div>
<!--<a href="javascript:;" class="mdui-btn mdui-btn-icon"><i class="mdui-icon material-icons">search</i></a>-->
<a href="<%- url_for() %>" title="<%= config.author || config.title %>" class="mdui-btn mdui-btn-icon"><img src="<%= theme.avatar %>" alt="<%= config.author || config.title %>"></a>
</div>
<%- partial('_partial/_analytics/gtm-body') %>
<div id="nexmoe-background">
<div class="nexmoe-bg" style="background-image: url(<%= theme.background.path %>)"></div>
<div class="mdui-appbar mdui-shadow-0">
<div class="mdui-toolbar">
<a mdui-drawer="{target: '#drawer', swipe: true}" title="menu" class="mdui-btn mdui-btn-icon mdui-ripple"><i class="mdui-icon nexmoefont icon-menu"></i></a>
<div class="mdui-toolbar-spacer"></div>
<!--<a href="javascript:;" class="mdui-btn mdui-btn-icon"><i class="mdui-icon material-icons">search</i></a>-->
<a href="<%- url_for() %>" title="<%= config.author || config.title %>" class="mdui-btn mdui-btn-icon"><img src="<%= theme.avatar %>" alt="<%= config.author || config.title %>"></a>
</div>
</div>
</div>
</div>
<div id="nexmoe-header">
<%- partial('_partial/header') %>
</div>
<div id="nexmoe-content">
<div class="nexmoe-primary">
<%- body %>
<div class="nexmoe-post-right">
<div class="nexmoe-fixed">
<div class="nexmoe-tool">

<% if (page.toc || theme.function.globalToc){ %>
<% const toc_obj = toc(page.content, {list_number: true}); %>
<% if (toc_obj.length > 0) { %>
<button class="mdui-fab catalog" style="overflow:unset;">
<i class="nexmoefont icon-i-catalog"></i>
<div class="nexmoe-toc">
<%- toc_obj %>
</div>
</button>
<% } %>
<div id="nexmoe-header">
<%- partial('_partial/header') %>
</div>
<div id="nexmoe-content">
<div class="nexmoe-primary">
<%- body %>
<div class="nexmoe-post-right">
<div class="nexmoe-fixed">
<div class="nexmoe-tool">

<% if (page.toc || theme.function.globalToc){ %>
<% const toc_obj = toc(page.content, {list_number: true}); %>
<% if (toc_obj.length > 0) { %>
<button class="mdui-fab catalog" style="overflow:unset;">
<i class="nexmoefont icon-i-catalog"></i>
<div class="nexmoe-toc">
<%- toc_obj %>
</div>
</button>
<% } %>
<%} %>

<%} %>

<a href="#nexmoe-content" class="toc-link" aria-label="回到顶部" title="top"><button class="mdui-fab mdui-ripple"><i class="nexmoefont icon-caret-top"></i></button></a>
<a href="#nexmoe-content" class="toc-link" aria-label="回到顶部" title="top"><button class="mdui-fab mdui-ripple"><i class="nexmoefont icon-caret-top"></i></button></a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<%- partial('_partial/after-footer') %>
<%- partial('_partial/analytics') %>
<%- partial('_partial/after-footer') %>
<%- partial('_partial/analytics') %>
</body>

</html>
40 changes: 21 additions & 19 deletions layout/post.ejs
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
<div class="nexmoe-post">

<article>
<% if (page.cover){ %>
<div class="nexmoe-post-cover" style="padding-bottom: <%- page.coverHeight/page.coverWidth*100 %>%;">
<img data-src="<%- page.cover %>" data-sizes="auto" alt="<%= page.title %>" class="lazyload">
<h1><%= page.title %></h1>
</div>
<%} else{ %>
<div class="nexmoe-post-cover" style="padding-bottom: <%- theme.background.height/theme.background.width*100 %>%;">
<img data-src="<%- theme.background.path %>" data-sizes="auto" alt="<%= page.title %>" class="lazyload">
<h1><%= page.title %></h1>
</div>
<% } %>

<%- partial('_partial/_post/meta') %>
<% if (page.cover){ %>
<div class="nexmoe-post-cover" style="padding-bottom: <%- page.coverHeight/page.coverWidth*100 %>%;">
<img data-src="<%- page.cover %>" data-sizes="auto" alt="<%= page.title %>" class="lazyload">
<h1><%= page.title %></h1>
</div>
<%} else{ %>
<div class="nexmoe-post-cover" style="padding-bottom: <%- theme.background.height/theme.background.width*100 %>%;">
<img data-src="<%- theme.background.path %>" data-sizes="auto" alt="<%= page.title %>" class="lazyload">
<h1><%= page.title %></h1>
</div>
<% } %>
<%- partial('_partial/_post/meta') %>



<%- image_auto_lazyload(page.content) %>
<%- image_auto_lazyload(page.content) %>
</article>

<% if (!page.reprint){ %>
<%- partial('_partial/copyright') %>
<%- partial('_partial/copyright') %>
<% } %>

<%- partial('_partial/_post/tag') %>

<div class="nexmoe-post-footer">
<%- theme.comment ? partial('_partial/comment') : '' %>
</div>
<% if (page.comments){ %>
<div class="nexmoe-post-footer">
<%- theme.comment ? partial('_partial/comment') : '' %>
</div>
<% } %>
</div>
8 changes: 4 additions & 4 deletions layout/py.ejs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="nexmoe-post">
<article class="nexmoe-py">
<%- image_auto_lazyload(page.content) %>
</article>
<%- partial('_partial/comment') %>
<article class="nexmoe-py">
<%- image_auto_lazyload(page.content) %>
</article>
<%- partial('_partial/comment') %>
</div>

0 comments on commit faf4240

Please sign in to comment.