Van 2018-09-23 15:32:37 +08:00
parent be808226a7
commit 06c24f31da
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
9 changed files with 46 additions and 30 deletions

View File

@ -28,7 +28,8 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<main class="main wrapper"> <main class="main">
<div class="wrapper">
<div class="content page-archive"> <div class="content page-archive">
<section class="posts-collapse"> <section class="posts-collapse">
<span class="archive-move-on"></span> <span class="archive-move-on"></span>
@ -45,6 +46,7 @@
<#include "article-list.ftl"> <#include "article-list.ftl">
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
</div>
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>

View File

@ -28,7 +28,8 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<main class="main wrapper"> <main class="main">
<div class="wrapper">
<div class="content page-archive"> <div class="content page-archive">
<section class="posts-collapse"> <section class="posts-collapse">
<span class="archive-move-on"></span> <span class="archive-move-on"></span>
@ -57,6 +58,7 @@
</section> </section>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
</div>
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>

View File

@ -51,7 +51,8 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<main class="main wrapper"> <main class="main">
<div class="wrapper">
<div class="content"> <div class="content">
<article class="posts-expand"> <article class="posts-expand">
<header class="post-header"> <header class="post-header">
@ -122,6 +123,7 @@
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
<div id="externalRelevantArticles"></div> <div id="externalRelevantArticles"></div>
<#include "side.ftl"> <#include "side.ftl">
</div>
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">
<@comment_script oId=article.oId> <@comment_script oId=article.oId>

View File

@ -28,7 +28,8 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<main class="main wrapper"> <main class="main">
<div class="wrapper">
<div class="content posts-collapse"> <div class="content posts-collapse">
<div class="collection-title"> <div class="collection-title">
<h2> <h2>
@ -39,6 +40,7 @@
<#include "article-list.ftl"> <#include "article-list.ftl">
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
</div>
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>

View File

@ -28,7 +28,8 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<main class="main wrapper"> <main class="main">
<div class="wrapper">
<div class="content"> <div class="content">
<#if 0 != recentComments?size> <#if 0 != recentComments?size>
<ul class="comments" id="comments"> <ul class="comments" id="comments">
@ -57,6 +58,7 @@
</#if> </#if>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
</div>
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">

View File

@ -20,26 +20,26 @@
<#include "macro-head.ftl"> <#include "macro-head.ftl">
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<@head title="${blogTitle}"> <@head title="${blogTitle}">
<#if metaKeywords??> <#if metaKeywords??>
<meta name="keywords" content="${metaKeywords}"/> <meta name="keywords" content="${metaKeywords}"/>
</#if> </#if>
<#if metaDescription??> <#if metaDescription??>
<meta name="description" content="${metaDescription}"/> <meta name="description" content="${metaDescription}"/>
</#if> </#if>
</@head> </@head>
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<main class="main"> <main class="main">
<div class="wrapper"> <div class="wrapper">
<div class="content"> <div class="content">
<#include "article-list.ftl"> <#include "article-list.ftl">
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
</div> </div>
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>
</html> </html>

View File

@ -29,7 +29,8 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<main class="main wrapper"> <main class="main">
<div class="wrapper">
<div class="content"> <div class="content">
<article class="post-body"> <article class="post-body">
${page.pageContent} ${page.pageContent}
@ -37,6 +38,7 @@
<@comments commentList=pageComments article=page></@comments> <@comments commentList=pageComments article=page></@comments>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
</div>
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">
<@comment_script oId=page.oId></@comment_script> <@comment_script oId=page.oId></@comment_script>

View File

@ -28,7 +28,8 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<main class="main wrapper"> <main class="main">
<div class="wrapper">
<div class="content posts-collapse"> <div class="content posts-collapse">
<div class="collection-title"> <div class="collection-title">
<h2> <h2>
@ -39,6 +40,7 @@
<#include "article-list.ftl"> <#include "article-list.ftl">
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
</div>
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>

View File

@ -28,7 +28,8 @@
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<main class="main wrapper"> <main class="main">
<div class="wrapper">
<#if mostUsedCategories?size != 0> <#if mostUsedCategories?size != 0>
<div class="content page-archive"> <div class="content page-archive">
<section class="posts-collapse"> <section class="posts-collapse">
@ -69,6 +70,7 @@
</div> </div>
</div> </div>
<#include "side.ftl"> <#include "side.ftl">
</div>
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">
<script> <script>