From bdf59f187cad860aae6acb14a5b0ea9aebf2f3d8 Mon Sep 17 00:00:00 2001 From: Mimi <1119186082@qq.com> Date: Sat, 15 Aug 2020 14:47:16 +0800 Subject: [PATCH] Separate the styles of different schemes --- source/css/_common/components/back-to-top.styl | 4 +--- source/css/_schemes/Gemini/index.styl | 9 --------- source/css/_schemes/Pisces/_layout.styl | 5 ----- source/css/_schemes/Pisces/_sidebar.styl | 3 --- source/css/_schemes/Pisces/_sub-menu.styl | 1 - source/css/_schemes/Pisces/index.styl | 15 +++++++++++++++ 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/source/css/_common/components/back-to-top.styl b/source/css/_common/components/back-to-top.styl index 5be4be7..4fcfb6a 100644 --- a/source/css/_common/components/back-to-top.styl +++ b/source/css/_common/components/back-to-top.styl @@ -6,9 +6,7 @@ transition: bottom $transition-ease; sidebar-toggle(); - if (hexo-config('back2top.scrollpercent')) { - width: initial; - } else { + if (!hexo-config('back2top.scrollpercent')) { width: 24px; } diff --git a/source/css/_schemes/Gemini/index.styl b/source/css/_schemes/Gemini/index.styl index ca4d4f1..c8d53a2 100644 --- a/source/css/_schemes/Gemini/index.styl +++ b/source/css/_schemes/Gemini/index.styl @@ -25,10 +25,6 @@ // ================================================== // Post blocks. .main-inner { - background: initial; - box-shadow: initial; - padding: initial; - .sub-menu, .post-block, .comments, .pagination { background: var(--content-bg-color); border-radius: $border-radius-inner; @@ -50,11 +46,6 @@ } } -// Sub-menu(s). -.sub-menu { - border-bottom: initial; -} - // Post & Comments blocks. .post-block, .comments { padding: $content-desktop-padding; diff --git a/source/css/_schemes/Pisces/_layout.styl b/source/css/_schemes/Pisces/_layout.styl index 4ce5448..2bd5cf9 100644 --- a/source/css/_schemes/Pisces/_layout.styl +++ b/source/css/_schemes/Pisces/_layout.styl @@ -34,22 +34,17 @@ .main-inner { align-self: stretch; - background: var(--content-bg-color); border-radius: $border-radius-inner; - box-shadow: $box-shadow-inner; box-sizing: border-box; - padding: $content-desktop-padding; width: $content-wrap; +tablet-mobile() { border-radius: initial; - padding: 20px; width: 100%; } } .footer-inner { - if (hexo-config('sidebar.position') == 'right') { padding-right: $sidebar-desktop + $sidebar-offset; } else { diff --git a/source/css/_schemes/Pisces/_sidebar.styl b/source/css/_schemes/Pisces/_sidebar.styl index f2ff3f4..d44ff86 100644 --- a/source/css/_schemes/Pisces/_sidebar.styl +++ b/source/css/_schemes/Pisces/_sidebar.styl @@ -1,7 +1,4 @@ .sidebar { - background: initial; - bottom: initial; - box-shadow: none; margin-top: $sidebar-offset; position: -webkit-sticky; position: sticky; diff --git a/source/css/_schemes/Pisces/_sub-menu.styl b/source/css/_schemes/Pisces/_sub-menu.styl index 86da3f9..7929b24 100644 --- a/source/css/_schemes/Pisces/_sub-menu.styl +++ b/source/css/_schemes/Pisces/_sub-menu.styl @@ -1,5 +1,4 @@ .sub-menu { - border-bottom: 1px solid $table-border-color; margin: 0; padding: 6px 0; diff --git a/source/css/_schemes/Pisces/index.styl b/source/css/_schemes/Pisces/index.styl index 66c5cd5..5574b5f 100644 --- a/source/css/_schemes/Pisces/index.styl +++ b/source/css/_schemes/Pisces/index.styl @@ -4,6 +4,21 @@ @import '_sub-menu'; @import '_sidebar'; +.main-inner { + background: var(--content-bg-color); + box-shadow: $box-shadow-inner; + padding: $content-desktop-padding; + + +tablet-mobile() { + padding: 20px; + } +} + +// Sub-menu(s). +.sub-menu { + border-bottom: 1px solid $table-border-color; +} + .post-block:first-of-type { padding-top: 40px; }