手动解决冲突问题

dev
julylies 3 months ago
commit d64d359ae9
  1. 4
      400.ftl
  2. 4
      404.ftl
  3. 86
      header.ftl
  4. 11
      index.ftl
  5. 6
      module/comment.ftl
  6. 29
      module/module_links.ftl
  7. 32
      module/module_menu.ftl
  8. 25
      module/module_pageNav.ftl
  9. 68
      module/module_post.ftl

@ -5,11 +5,7 @@
<div class="error-page">
<h1>400</h1>
<p>嘤嘤嘤,找不到页面啦</p>
<<<<<<< HEAD
<img src="${theme_base!}/source/images/404.png" />
=======
<img src="${theme_base!}/source/images/404.png"/>
>>>>>>> 4fe9ac8 (瞎改的一天)
</div>
</div>
</main>

@ -5,11 +5,7 @@
<div class="error-page">
<h1>404</h1>
<p>嘤嘤嘤,找不到页面啦</p>
<<<<<<< HEAD
<img src="${theme_base!}/source/images/404.png" />
=======
<img src="${theme_base!}/source/images/404.png"/>
>>>>>>> 4fe9ac8 (瞎改的一天)
</div>
</div>
</main>

@ -2,90 +2,6 @@
<!DOCTYPE html>
<html lang="zh">
<head>
<<<<<<< HEAD
<title>${title}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="renderer" content="webkit" />
<meta name="format-detection" content="telephone=no,email=no,adress=no" />
<meta http-equiv="Cache-Control" content="no-siteapp">
<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
<meta name="keywords" content="${meta_keywords!}" />
<meta name="description" content="${meta_description!}" />
<#--<meta name="theme-color" content="#4285f4">-->
<meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="black">
<#-- 导航面包蟹-->
<meta property="og:image" content="${options.blog_favicon!}">
<meta property="og:description" content="${meta_description!}">
<meta property="og:type" content="website">
<meta property="og:locale" content="zh_CN">
<meta property="og:site_name" content="${blog_title!}">
<meta property="og:url" content="${blog_url!}">
<meta property="og:title" content="${title!} – ${blog_title!}">
<meta name="viewport"content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="author" content="${user.nickname!}">
<meta http-equiv="x-dns-prefetch-control" content="on">
<meta name="site" content="${blog_url!}">
<meta property="twitter:partner" content="ogwp">
<link rel="canonical" href="${blog_url!}">
<#if !(options.blog_favicon?? && options.blog_favicon!='' )>
<link rel="apple-touch-icon" type="images/x-icon" href="${theme_base!}/source/images/icon.png"sizes="180x180" />
</#if>
<link rel="alternate" type="application/rss+xml" title="atom 1.0" href="${atom_url!}">
<link href="${theme_base!}/source/css/kico.css" rel="stylesheet" type="text/css" />
<link href="${theme_base!}/source/css/single.css" rel="stylesheet" type="text/css" />
<link href="${theme_base!}/source/css/font-awesome-animation.min.css" rel="stylesheet" type="text/css" />
<link href="${theme_base!}/source/plugins/prism/katex.min.css" rel="stylesheet" type="text/css" />
<#--<link href="https://fastly.jsdelivr.net/gh/FortAwesome/Font-Awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />-->
<link href="https://fastly.jsdelivr.net/gh/FortAwesome/Font-Awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<link rel="preload stylesheet" as="style" href="${theme_base!}/source/plugins/prism/themes/prism-${settings.Code_highlighting!}.css">
<@global.head />
<#if !(options.blog_favicon?? && options.blog_favicon!='' )>
<link rel="shortcut icon" type="images/x-icon" href="${theme_base!}/source/images/icon.png" sizes="192x192" />
</#if>
<#-- 背景图片-->
<#if settings.background?? && settings.background!=''>
<style>
body:before {
content: '';
background-image: url(${settings.background!})
}
</style>
</#if>
<#-- 自定css-->
<#if settings.custom_css?? && settings.custom_css!=''>
${custom_css!}
</#if>
</head>
<#-- 夜间模式 -->
<body <#if (settings.night_mode?? && settings.night_mode=='2' )>
class="dark-theme"
<#elseif (settings.night_mode?? && settings.night_mode=='1' )>
<#assign currentDateTime=.now>
<#assign hour=currentDateTime?string("HH")>
<#if (hour?eval>=20|| hour?eval <=6)>
class="dark-theme"
</#if>
</#if>
>
<header>
<div class="head-title">
<h4>${blog_title!}</h4>
</div>
<div class="head-action">
<div class="toggle-btn"></div>
<div class="light-btn"></div>
<div class="search-btn"></div>
</div>
<form class="head-search" method="get" action="/search" role="search">
<input class="text" type="search" name="keyword" placeholder="搜索什么呢つ﹏⊂" required>
</form>
<nav class="head-menu">
<#include "module/module_menu.ftl">
</nav>
</header>
</#macro>
=======
<title>${title}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="renderer" content="webkit" />
@ -164,5 +80,3 @@
</nav>
</header>
</#macro>
>>>>>>> 4fe9ac8 (瞎改的一天)

@ -1,14 +1,4 @@
<#include "header.ftl">
<<<<<<< HEAD
<@head title="${blog_title!}" />
<#include "module/module_pageNav.ftl">
<main>
<div class="wrap min">
<#include "module/module_post.ftl">
<@pageNav method="index" />
</div>
<main>
=======
<@head title="${blog_title!}" />
<#include "module/module_pageNav.ftl">
<main>
@ -17,5 +7,4 @@
<@pageNav method="index" />
</div>
<main>
>>>>>>> 4fe9ac8 (瞎改的一天)
<#include "footer.ftl">

@ -1,13 +1,7 @@
<#macro comment target,type>
<#if !post.disallowComment!false>
<<<<<<< HEAD
<script src="//cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.min.js"></script>
<script src="${options.comment_internal_plugin_js!'//cdn.jsdelivr.net/gh/halo-dev/halo-comment@latest/dist/halo-comment.min.js'}"></script>
<halo-comment id="${post.id?c}" type="${type}" />
=======
<script src="//cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.min.js"></script>
<script src="${options.comment_internal_plugin_js!'//cdn.jsdelivr.net/gh/halo-dev/halo-comment@latest/dist/halo-comment.min.js'}"></script>
<halo-comment id="${post.id?c}" type="${type}"/>
>>>>>>> 4fe9ac8 (瞎改的一天)
</#if>
</#macro>

@ -1,31 +1,4 @@
<h1>友情链接</h1>
<<<<<<< HEAD
<article>
<div class="links">
<@linkTag method="listTeams">
<#list teams as item>
<h3 class="link-title">
<span class="fake-title">${((item.team!'')?length>0)?string((item.team!''), '小伙伴们')}</span>
</h3>
<ul class="link-items fontSmooth">
<#list item.links?sort_by('priority')?reverse as link>
<li class="link-item">
<a class="link-item-inner effect-apollo" href="${link.url!}" title="${link.name!}"
target="_blank">
<img class="lazyload"
data-src="${theme_base!}/source/images/svg/loader/trans.ajax-spinner-preloader.svg"
src="${link.logo!}" onerror="imgError(this)">
<span class="sitename">${link.name!}</span>
<div class="linkdes">${link.description!}</div>
</a>
</li>
</#list>
</ul>
</#list>
</@linkTag>
</div>
</article>
=======
<article>
<div class="links">
<@linkTag method="listTeams">
@ -48,5 +21,3 @@
</@linkTag>
</div>
</article>
>>>>>>> 4fe9ac8 (瞎改的一天)

@ -1,5 +1,4 @@
<@menuTag method="tree">
<<<<<<< HEAD
<#list menus?sort_by('priority') as menu>
<#if menu.children?? && menu.children?size gt 0>
<div class="has-child">
@ -29,35 +28,4 @@
</div>
</#if>
</#list>
=======
<#list menus?sort_by('priority') as menu>
<#if menu.children?? && menu.children?size gt 0>
<div class="has-child">
</#if >
<a <#if menu.url?? && menu.url?trim?length gt 0> href="${menu.url!}" target="${menu.target!}" </#if>>
<span class="faa-parent animated-hover">
<#if menu.icon?? && menu.icon?trim?length gt 0>
<i class="${menu.icon}" aria-hidden="true"></i>
</#if>${menu.name}
</span>
</a>
<#if menu.children?? && menu.children?size gt 0>
<div class="sub-menu">
<#list menu.children?sort_by('priority') as child>
<a href="${child.url!}" target="${child.target!}">
<span class="faa-parent animated-hover">
<#if child.icon?? && child.icon?trim?length gt 1>
<i class="${child.icon}" aria-hidden="true"></i>
</#if>${child.name}
</span>
</a>
</#list>
</div >
</#if>
<#if menu.children?? && menu.children?size gt 0>
</div >
</#if >
</#list>
>>>>>>> 4fe9ac8 (瞎改的一天)
</@menuTag>

@ -1,4 +1,3 @@
<<<<<<< HEAD
<#macro pageNav method keyword="">
<section class="page-navigator">
<@paginationTag method="${method}" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}"
@ -12,34 +11,11 @@
<#if number.isCurrent>
<span class="current">
<a href="${number.fullPath!}">${number.page!}</a>
=======
<#macro pageNav method>
<section class="page-navigator">
<@paginationTag method="${method}" slug="${slug!}" page="${posts.number}" keyword="${keyword}" total="${posts.totalPages}" display="3">
<#if pagination.hasPrev>
<span class="prev">
<a href="${pagination.prevPageFullPath!}" title="上一页">«</a>
</span>
</#if>
<#list pagination.rainbowPages as number>
<#if number.isCurrent>
<span class="current">
<a href="${number.fullPath!}">${number.page!}</a>
>>>>>>> 4fe9ac8 (瞎改的一天)
</span>
<#else>
<span>
<a href="${number.fullPath!}">${number.page!}</a>
</span>
<<<<<<< HEAD
</#if>
</#list>
<#if pagination.hasNext>
<span class="next">
<a href="${pagination.nextPageFullPath!}" title="下一页">»</a>
</span>
</#if>
=======
</#if>
</#list>
<#if pagination.hasNext>
@ -47,7 +23,6 @@
<a href="${pagination.nextPageFullPath!}" title="下一页">»</a>
</span>
</#if>
>>>>>>> 4fe9ac8 (瞎改的一天)
</@paginationTag>
</section>
</#macro>

@ -1,4 +1,3 @@
<<<<<<< HEAD
<#include "module_homeSocial.ftl" />
<#--判断页面显示标题-->
<#if is_tag??>
@ -52,70 +51,3 @@
</div>
</#list>
</section>
=======
<#--判断主页显示社交链接-->
<#if is_index??>
<section class="home-title">
<h1>${blog_title!}</h1>
<span>${user.description!}</span>
<div class="home-social">
<#if settings.home_social?? && settings.home_social != ''>
${settings.home_social!}
</#if>
</div>
</section>
</#if>
<#--判断页面显示标题-->
<#if is_tag??>
<section class="home-title">
<h1>包含“${tag.name}”标签的文章</h1>
</section>
</#if>
<#if is_category??>
<section class="home-title">
<h1>“${category.name}”分类下的文章</h1>
</section>
</#if>
<#if is_search??>
<section class="home-title">
<h1>包含“${keyword!}”关键字的文章</h1>
</section>
</#if>
<#--显示文章-->
<section class="home-posts">
<#list posts.content as post>
<div class="post-item">
<h2>
<a href="${post.fullPath!}">${post.title!}</a>
</h2>
<#--显示文章简介-->
<p>${post.summary!}</p>
<#--文章标签等-->
<div class="post-meta">
<time class="date">
${post.createTime?string('yyyy-MM-dd')!}
</time>
<span class="category">
<#list post.categories as category>
<a href="${category.fullPath!}" >
${category.name!}
</a>
</#list>
</span>
<span class="tags">
<#list post.tags as tag>
<a href="${tag.fullPath}" class="tag">${tag.name}</a>
</#list>
</span>
<span class="comments">
${post.commentCount!}°C
</span>
<span class="visits">
${post.visits!}
</span>
</div>
</div>
</#list>
</section>
>>>>>>> 4fe9ac8 (瞎改的一天)

Loading…
Cancel
Save