From a5ef411615739bc92a723c1d1c72d27d1e2bb353 Mon Sep 17 00:00:00 2001 From: 7Wate Date: Fri, 21 Jan 2022 11:25:35 +0800 Subject: [PATCH] pages(css): perfect details --- module/header.ftl | 14 ++++---------- module/macro.ftl | 6 +++--- photos.ftl | 4 ---- settings.yaml | 12 ------------ source/css/Redemption.css | 13 ++++++++----- source/css/base/_base.scss | 7 ++++--- source/css/pages/_index.scss | 3 +++ source/css/pages/_journals.scss | 1 + source/css/pages/_links.scss | 1 - source/css/pages/_post.scss | 1 + source/css/pages/layout/_header.scss | 1 + source/css/redemption.css.map | 2 +- source/images/travellings.svg | 1 + 13 files changed, 27 insertions(+), 39 deletions(-) create mode 100644 source/images/travellings.svg diff --git a/module/header.ftl b/module/header.ftl index d9ad962..fc8b729 100644 --- a/module/header.ftl +++ b/module/header.ftl @@ -1,28 +1,22 @@
- 救赎之路 + ${blog_title!}

${settings.sub_title!'the site subtitle'}

- <#if settings.aboutme??> - - + <#if settings.github??> - <#if settings.wechat??> - - <#if settings.bilibili??> <#if settings.mail??> - <#if settings.links??> - - + +
diff --git a/module/macro.ftl b/module/macro.ftl index 96d8ef0..1aea2ec 100644 --- a/module/macro.ftl +++ b/module/macro.ftl @@ -28,10 +28,10 @@
diff --git a/photos.ftl b/photos.ftl index e6c1119..32698d3 100644 --- a/photos.ftl +++ b/photos.ftl @@ -73,10 +73,6 @@
  • GitHub
    • - <#if settings.wechat??> -
  • Wechat
    • - - <#if settings.bilibili??>
  • Bilibili
    • diff --git a/settings.yaml b/settings.yaml index c76401b..65f029e 100644 --- a/settings.yaml +++ b/settings.yaml @@ -20,18 +20,10 @@ photos: sns: label: 社交资料 items: - aboutme: - name: aboutme - label: 关于我 - type: text github: name: github label: Github type: text - wechat: - name: wechat - label: 微信 - type: text bilibili: name: bilibili label: 哔哩哔哩 @@ -40,7 +32,3 @@ sns: name: mail label: 邮箱 type: text - links: - name: 友链 - label: links - type: text diff --git a/source/css/Redemption.css b/source/css/Redemption.css index 402fe91..2ca9663 100644 --- a/source/css/Redemption.css +++ b/source/css/Redemption.css @@ -128,13 +128,12 @@ main > .journals { font-size: 0.5rem; } -img { - width: 100% !important; -} - .heti { max-width: 45rem !important; } +.heti > img { + width: 100% !important; +} @-webkit-keyframes fadeInDown { 0% { @@ -654,6 +653,9 @@ footer .copyright a:hover { .index > .info { padding: 0.5rem 0 2rem 0; } + .index > .info > span { + padding: 0 0.5rem; + } } /* @@ -675,6 +677,7 @@ footer .copyright a:hover { } .journals > ul > li > .content { font-size: 1rem; + line-height: 1.5rem; color: #595959; } .journals > ul > li > .info { @@ -739,7 +742,6 @@ footer .copyright a:hover { display: flex; justify-content: space-between; font-size: 1rem; - padding-bottom: 0.3rem; line-height: 1.5rem; } .links > ul > li > a { @@ -805,6 +807,7 @@ footer .copyright a:hover { .post > .title > .info { display: flex; border-bottom: 1px solid #d9d9d9; + margin-bottom: 1rem; } .post > .title > .info > span { font-weight: 400; diff --git a/source/css/base/_base.scss b/source/css/base/_base.scss index 137cbe1..cb57887 100644 --- a/source/css/base/_base.scss +++ b/source/css/base/_base.scss @@ -117,12 +117,13 @@ main>.journals { bottom: 10rem; font-size: 0.5rem; } -img{ - width: 100%!important; -} + .heti{ max-width: 45rem!important; + > img{ + width: 100%!important; + } } diff --git a/source/css/pages/_index.scss b/source/css/pages/_index.scss index ef2620b..2273b3d 100644 --- a/source/css/pages/_index.scss +++ b/source/css/pages/_index.scss @@ -121,6 +121,9 @@ >.info { padding: 0.5rem 0 2rem 0; + >span{ + padding: 0 0.5rem; + } } } } \ No newline at end of file diff --git a/source/css/pages/_journals.scss b/source/css/pages/_journals.scss index e669240..6ff3e28 100644 --- a/source/css/pages/_journals.scss +++ b/source/css/pages/_journals.scss @@ -22,6 +22,7 @@ >li { >.content { font-size: 1rem; + line-height: 1.5rem; color: #595959; } diff --git a/source/css/pages/_links.scss b/source/css/pages/_links.scss index 571aa0e..fdb0ec1 100644 --- a/source/css/pages/_links.scss +++ b/source/css/pages/_links.scss @@ -23,7 +23,6 @@ display: flex; justify-content: space-between; font-size: 1rem; - padding-bottom: 0.3rem; line-height: 1.5rem; >a { diff --git a/source/css/pages/_post.scss b/source/css/pages/_post.scss index a65e5d2..0a3f163 100644 --- a/source/css/pages/_post.scss +++ b/source/css/pages/_post.scss @@ -28,6 +28,7 @@ >.info { display: flex; border-bottom: 1px solid #d9d9d9; + margin-bottom: 1rem; >span { font-weight: 400; diff --git a/source/css/pages/layout/_header.scss b/source/css/pages/layout/_header.scss index 4e91b95..28bd603 100644 --- a/source/css/pages/layout/_header.scss +++ b/source/css/pages/layout/_header.scss @@ -3,6 +3,7 @@ .header { display: flex; + // 站点标题 >.title { diff --git a/source/css/redemption.css.map b/source/css/redemption.css.map index a70121b..be78432 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 diff --git a/source/images/travellings.svg b/source/images/travellings.svg new file mode 100644 index 0000000..a140cdd --- /dev/null +++ b/source/images/travellings.svg @@ -0,0 +1 @@ +travelling \ No newline at end of file