diff --git a/module/macro.ftl b/module/macro.ftl index 1aea2ec..f82683b 100644 --- a/module/macro.ftl +++ b/module/macro.ftl @@ -1,6 +1,7 @@ <#macro layout title> - +<#-- --> + @@ -16,7 +17,7 @@ <#-- 自定义样式表 --> - +
diff --git a/source/css/Redemption.css b/source/css/Redemption.css index 2ca9663..d67123f 100644 --- a/source/css/Redemption.css +++ b/source/css/Redemption.css @@ -4,6 +4,20 @@ html { -webkit-font-smoothing: antialiased; font-size: 16px; } +@media (max-width: 870px) { + html { + font-size: 18px; + font-family: -apple-system, BlinksMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-weight: 500; + } +} +@media (min-width: 870px) and (max-width: 2048px) { + html { + font-size: 16px; + font-family: -apple-system, BlinksMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-weight: 400; + } +} [data-font=serif] { font-family: -apple-system, BlinksMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; @@ -70,8 +84,8 @@ main { } @media (max-width: 870px) { main { - width: 90%; - margin-top: 5%; + width: 99%; + margin-top: 1%; padding-bottom: 5%; } } @@ -977,4 +991,4 @@ footer .copyright a:hover { } } -/*# sourceMappingURL=redemption.css.map */ +/*# sourceMappingURL=Redemption.css.map */ diff --git a/source/css/base/_base.scss b/source/css/base/_base.scss index cb57887..a853dcd 100644 --- a/source/css/base/_base.scss +++ b/source/css/base/_base.scss @@ -69,8 +69,8 @@ main { // =========== 移动端 =========== @media (max-width: 870px) { - width: 90%; - margin-top: 5%; + width: 99%; + margin-top: 1%; padding-bottom: 5%; } diff --git a/source/css/base/_font.scss b/source/css/base/_font.scss index 4f821ea..cb9a0f5 100644 --- a/source/css/base/_font.scss +++ b/source/css/base/_font.scss @@ -5,15 +5,23 @@ html { -webkit-font-smoothing: antialiased; font-size: 16px; - // // =========== 移动端 =========== - // @media (max-width: 870px) { - // font-size: 16px; - // } + // =========== 移动端 =========== + @media (max-width: 870px) { + font-size: 18px; + font-family: -apple-system, BlinksMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, + 'Noto Sans', serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', + 'Noto Color Emoji'; + font-weight: 500; + } - // // =========== 桌面端 =========== - // @media (min-width: 870px) and (max-width: 2048px) { - // font-size: 16px; - // } + // =========== 桌面端 =========== + @media (min-width: 870px) and (max-width: 2048px) { + font-size: 16px; + font-family: -apple-system, BlinksMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, + 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', + 'Noto Color Emoji'; + font-weight: 400; + } } // 衬线字体 diff --git a/source/css/redemption.css.map b/source/css/redemption.css.map index be78432..bab86b1 100644 --- a/source/css/redemption.css.map +++ b/source/css/redemption.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["base/_font.scss","base/_base.scss","base/_variables.scss","pages/layout/_header.scss","pages/layout/_footer.scss","pages/layout/_pagenav.scss","pages/layout/_comment.scss","pages/_archives.scss","pages/_category.scss","pages/_index.scss","pages/_journals.scss","pages/_links.scss","pages/_post.scss","pages/_tag.scss"],"names":[],"mappings":"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","file":"redemption.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["base/_font.scss","base/_base.scss","base/_variables.scss","pages/layout/_header.scss","pages/layout/_footer.scss","pages/layout/_pagenav.scss","pages/layout/_comment.scss","pages/_archives.scss","pages/_category.scss","pages/_index.scss","pages/_journals.scss","pages/_links.scss","pages/_post.scss","pages/_tag.scss"],"names":[],"mappings":"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","file":"Redemption.css"} \ No newline at end of file