github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

🐛 修复Material主题样式混乱的问题

pull/33/merge
ruibaby 2018-09-14 14:15:06 +08:00
parent 1f5cc1f26b
commit 6a4c3df64a
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/templates/themes/material/_partial/footer.ftl
View File

@ -1,6 +1,6 @@
<!--Footer--> <!--Footer-->
<footer class="mdl-mini-footer" id="bottom"> <footer class="mdl-mini-footer" id="bottom">
<#if options.theme_material_scheme?if_exists == "Paradox"> <#if options.theme_material_scheme?default('Paradox') == "Paradox">
<!-- Paradox Footer Left Section --> <!-- Paradox Footer Left Section -->
<#include "footer-left.ftl"> <#include "footer-left.ftl">

4
src/main/resources/templates/themes/material/_partial/post-content.ftl
View File

@ -1,5 +1,5 @@
<div id="post-content" class="mdl-color-text--grey-700 mdl-card__supporting-text fade out"> <div id="post-content" class="mdl-color-text--grey-700 mdl-card__supporting-text fade out">
<#if options.theme_material_scheme?if_exists == "Paradox"> <#if options.theme_material_scheme?default('Paradox') == "Paradox">
${post.postContent?if_exists} ${post.postContent?if_exists}
<#if options.theme_material_other_post_license??> <#if options.theme_material_other_post_license??>
<blockquote style="margin: 2em 0 0;padding: 0.5em 1em;border-left: 3px solid #F44336;background-color: #F5F5F5;list-style: none;"> <blockquote style="margin: 2em 0 0;padding: 0.5em 1em;border-left: 3px solid #F44336;background-color: #F5F5F5;list-style: none;">
@ -12,7 +12,7 @@
</#if> </#if>
</#if> </#if>
<#if options.theme_material_scheme?if_exists == "Isolation"> <#if options.theme_material_scheme?default('Paradox') == "Isolation">
<div class="post-content_wrapper"> <div class="post-content_wrapper">
<p class="post-title"> <p class="post-title">
${post.postTitle?if_exists} ${post.postTitle?if_exists}

4
src/main/resources/templates/themes/material/_partial/post-header.ftl
View File

@ -1,4 +1,4 @@
<#if options.theme_material_scheme?if_exists == "Paradox"> <#if options.theme_material_scheme?default('Paradox') == "Paradox">
<!-- Paradox Post Header --> <!-- Paradox Post Header -->
<!-- Random Thumbnail --> <!-- Random Thumbnail -->
<#if post.postThumbnail?if_exists == "${options.blog_url}/static/images/thumbnail.png"> <#if post.postThumbnail?if_exists == "${options.blog_url}/static/images/thumbnail.png">
@ -12,7 +12,7 @@
</p> </p>
</div> </div>
</#if> </#if>
<#if options.theme_material_scheme?if_exists == "Isolation"> <#if options.theme_material_scheme?default('Paradox') == "Isolation">
<div class="post-header_info without-thumbnail"> <div class="post-header_info without-thumbnail">
<!-- Author Avatar & Name --> <!-- Author Avatar & Name -->
<img src="${user.userAvatar?default('/material/source/img/avatar.png')}" class="avatar-img" width="44px" height="44px" alt="${user.userDisplayName?default('halo')}'s avatar"> <img src="${user.userAvatar?default('/material/source/img/avatar.png')}" class="avatar-img" width="44px" height="44px" alt="${user.userDisplayName?default('halo')}'s avatar">

4
src/main/resources/templates/themes/material/archives.ftl
View File

@ -6,7 +6,7 @@
<!-- Pin on top --> <!-- Pin on top -->
<!-- Normal Post --> <!-- Normal Post -->
<#if options.theme_material_scheme?if_exists == "Paradox"> <#if options.theme_material_scheme?default('Paradox') == "Paradox">
<!-- Paradox Thumbnail --> <!-- Paradox Thumbnail -->
<#include "_partial/Paradox-post_entry.ftl"> <#include "_partial/Paradox-post_entry.ftl">
<#else> <#else>
@ -15,7 +15,7 @@
</#if> </#if>
<#include "_partial/index-nav.ftl"> <#include "_partial/index-nav.ftl">
<@nav url="/archives/"></@nav> <@nav url="/archives/"></@nav>
<#if options.theme_material_scheme?if_exists == "Paradox"> <#if options.theme_material_scheme?default('Paradox') == "Paradox">
<#include "_partial/Paradox-post_entry-thumbnail.ftl"> <#include "_partial/Paradox-post_entry-thumbnail.ftl">
</#if> </#if>
</div> </div>

4
src/main/resources/templates/themes/material/page.ftl
View File

@ -8,7 +8,7 @@
<!-- Post Header(Thumbnail & Title) --> <!-- Post Header(Thumbnail & Title) -->
<#include "_partial/post-header.ftl"> <#include "_partial/post-header.ftl">
<#if options.theme_material_scheme?if_exists == "Paradox"> <#if options.theme_material_scheme?default('Paradox') == "Paradox">
<!-- Paradox Post Info --> <!-- Paradox Post Info -->
<#include "_partial/Paradox-post-info.ftl"> <#include "_partial/Paradox-post-info.ftl">
</#if> </#if>
@ -16,7 +16,7 @@
<!-- Post Content --> <!-- Post Content -->
<#include "_partial/post-content.ftl"> <#include "_partial/post-content.ftl">
<#if options.theme_material_scheme?if_exists == "Isolation"> <#if options.theme_material_scheme?default('Paradox') == "Isolation">
<#include "_partial/Isolation-post-info.ftl"> <#include "_partial/Isolation-post-info.ftl">
</#if> </#if>

4
src/main/resources/templates/themes/material/post.ftl
View File

@ -8,7 +8,7 @@
<!-- Post Header(Thumbnail & Title) --> <!-- Post Header(Thumbnail & Title) -->
<#include "_partial/post-header.ftl"> <#include "_partial/post-header.ftl">
<#if options.theme_material_scheme?if_exists == "Paradox"> <#if options.theme_material_scheme?default('Paradox') == "Paradox">
<!-- Paradox Post Info --> <!-- Paradox Post Info -->
<#include "_partial/Paradox-post-info.ftl"> <#include "_partial/Paradox-post-info.ftl">
</#if> </#if>
@ -16,7 +16,7 @@
<!-- Post Content --> <!-- Post Content -->
<#include "_partial/post-content.ftl"> <#include "_partial/post-content.ftl">
<#if options.theme_material_scheme?if_exists == "Isolation"> <#if options.theme_material_scheme?default('Paradox') == "Isolation">
<#include "_partial/Isolation-post-info.ftl"> <#include "_partial/Isolation-post-info.ftl">
</#if> </#if>