diff --git a/layout/article-content.ejs b/layout/article-content.ejs index abbb45c..618db3c 100644 --- a/layout/article-content.ejs +++ b/layout/article-content.ejs @@ -1,4 +1,4 @@ -
+

<%= page.title %>

diff --git a/source/css/layout/_partial/header.styl b/source/css/layout/_partial/header.styl index 8a1abab..2a0db53 100644 --- a/source/css/layout/_partial/header.styl +++ b/source/css/layout/_partial/header.styl @@ -12,7 +12,7 @@ background: var(--background-color); if (hexo-config('magic.enable') == true) { - magic-style(1.02); + magic-style(1.02, 1.02); } diff --git a/source/css/layout/_partial/sidebar-categories.styl b/source/css/layout/_partial/sidebar-categories.styl index eec0380..f2d083e 100644 --- a/source/css/layout/_partial/sidebar-categories.styl +++ b/source/css/layout/_partial/sidebar-categories.styl @@ -5,7 +5,7 @@ position relative background: var(--background-color); - magic-container(1.02, 20px); + magic-container(1.02, 1.02, 20px); .category-label { margin-bottom: 12px; diff --git a/source/css/layout/_partial/sidebar-tagcloud.styl b/source/css/layout/_partial/sidebar-tagcloud.styl index cc47e75..7d8ae29 100644 --- a/source/css/layout/_partial/sidebar-tagcloud.styl +++ b/source/css/layout/_partial/sidebar-tagcloud.styl @@ -5,7 +5,7 @@ position relative background: var(--background-color); - magic-container(1.02, 20px); + magic-container(1.02, 1.02, 20px); .tagcloud-label { margin-bottom: 12px; diff --git a/source/css/layout/_partial/sidebar-tags.styl b/source/css/layout/_partial/sidebar-tags.styl index b45ca7d..7b586af 100644 --- a/source/css/layout/_partial/sidebar-tags.styl +++ b/source/css/layout/_partial/sidebar-tags.styl @@ -4,7 +4,7 @@ position relative background: var(--background-color); - magic-container(1.02, 20px); + magic-container(1.02, 1.02, 20px); .tag-label { margin-bottom: 12px; diff --git a/source/css/layout/_partial/sidebar-toc.styl b/source/css/layout/_partial/sidebar-toc.styl index f9e89dc..5293e9f 100644 --- a/source/css/layout/_partial/sidebar-toc.styl +++ b/source/css/layout/_partial/sidebar-toc.styl @@ -10,7 +10,7 @@ background: var(--background-color); if (hexo-config('magic.enable') && hexo-config('magic.sidebar.enable')) { - magic-container(1.02, 20px); + magic-container(1.02, 1.02, 20px); } .post-toc { diff --git a/source/css/layout/_partial/site-info.styl b/source/css/layout/_partial/site-info.styl index b697362..f02cad1 100644 --- a/source/css/layout/_partial/site-info.styl +++ b/source/css/layout/_partial/site-info.styl @@ -6,7 +6,7 @@ box-sizing: border-box; background: var(--background-color); - magic-container(1.02, 20px); + magic-container(1.02, 1.02, 20px); .justify-center { display: flex; diff --git a/source/css/layout/_partial/tools.styl b/source/css/layout/_partial/tools.styl index 5cb5e6e..cf2e2ed 100644 --- a/source/css/layout/_partial/tools.styl +++ b/source/css/layout/_partial/tools.styl @@ -21,7 +21,7 @@ $li-margin-bottom = 12px; background: var(--background-color); if (hexo-config('magic.enable') == true) { - magic-style(1.1); + magic-style(1.1, 1.1); } else { border: 1px solid var(--border-color); } diff --git a/source/css/layout/about.styl b/source/css/layout/about.styl index d86b5e2..a0f28b8 100644 --- a/source/css/layout/about.styl +++ b/source/css/layout/about.styl @@ -4,7 +4,7 @@ background: var(--background-color); - magic-container(1.01, 30px); + magic-container(1.005, 1.01, 30px); .about-content { diff --git a/source/css/layout/archive-content.styl b/source/css/layout/archive-content.styl index 06b2cab..9863c3e 100644 --- a/source/css/layout/archive-content.styl +++ b/source/css/layout/archive-content.styl @@ -2,7 +2,7 @@ .archive-container { background: var(--background-color); - magic-container(1.01, 30px); + magic-container(1.005, 1.01, 30px); } diff --git a/source/css/layout/article-content.styl b/source/css/layout/article-content.styl index c8ac6a2..6d9f88d 100644 --- a/source/css/layout/article-content.styl +++ b/source/css/layout/article-content.styl @@ -5,17 +5,8 @@ background: var(--background-color); - if (hexo-config('magic.enable') == true) { - - box-shadow: 0 0 3px var(--border-color); - padding: 30px; - transition: all 0.3s ease; - border-radius: 2px; - - &:hover { - box-shadow: 0 0 8px var(--border-color); - transform: scaleX(1.008) scaleY(1.002); - } + if (hexo-config('magic.enable')) { + magic-container(1.008, 1.002, 30px); } @@ -33,10 +24,12 @@ } + .meta-info { margin: 10px 0 30px 0; } + .article-content { text-align: justify; padding-bottom: 30px; @@ -76,7 +69,7 @@ if ((hexo-config('magic.enable') && !hexo-config('magic.sidebar.enable') && hexo } if (hexo-config('magic.enable') == true) { - magic-container(1.02, 20px); + magic-container(1.02, 1.02, 20px); } else { transition(); border: 1px solid var(--border-color); diff --git a/source/css/layout/category-content.styl b/source/css/layout/category-content.styl index 4dbd443..b19f47b 100644 --- a/source/css/layout/category-content.styl +++ b/source/css/layout/category-content.styl @@ -5,7 +5,7 @@ background: var(--background-color); if (hexo-config('magic.enable')) { - magic-container(1.02, 30px); + magic-container(1.02, 1.02, 30px); } .category-name { diff --git a/source/css/layout/common/basic.styl b/source/css/layout/common/basic.styl index f601342..1ca13f3 100644 --- a/source/css/layout/common/basic.styl +++ b/source/css/layout/common/basic.styl @@ -59,7 +59,7 @@ button { background: var(--background-color); if (hexo-config('magic.enable') == true) { - magic-style(1.1); + magic-style(1.1, 1.1); } else { border: 1px solid var(--border-color); } diff --git a/source/css/layout/common/magic-theme.styl b/source/css/layout/common/magic-theme.styl index ceed901..e6880b4 100644 --- a/source/css/layout/common/magic-theme.styl +++ b/source/css/layout/common/magic-theme.styl @@ -1,6 +1,6 @@ @require "animated.styl" -magic-style(scale) { +magic-style(scaleX, scaleY) { if (hexo-config('magic.enable') == true) { box-shadow: 0 0 3px var(--border-color); @@ -9,16 +9,14 @@ magic-style(scale) { &:hover { transition(); box-shadow: 0 0 8px var(--border-color); - transform: scale(scale); + transform: scaleX(scaleX) scaleY(scaleY); } } } -magic-container(scale, padding) { - if (hexo-config('magic.enable') == true) { - magic-style(scale); - padding: padding; - border-radius: 2px; - } +magic-container(scaleX, scaleY, padding) { + magic-style(scaleX, scaleY); + padding: padding; + border-radius: 2px; } diff --git a/source/css/layout/common/variables.styl b/source/css/layout/common/variables.styl index 6eeb5f3..35dbc74 100644 --- a/source/css/layout/common/variables.styl +++ b/source/css/layout/common/variables.styl @@ -28,7 +28,6 @@ $component-interspace = 30px; // 组件/模块的间隔值(px) $media-max-width = 760px; // 媒体查询最大宽度 - // =============================== // z-index // =============================== diff --git a/source/css/layout/home-content.styl b/source/css/layout/home-content.styl index eb9b049..398175a 100644 --- a/source/css/layout/home-content.styl +++ b/source/css/layout/home-content.styl @@ -11,7 +11,7 @@ if (hexo-config('magic.enable') == true) { - magic-container(1.02, 30px); + magic-container(1.02, 1.02, 30px); margin-bottom: $component-interspace; } else { diff --git a/source/css/layout/page.styl b/source/css/layout/page.styl index 51e3ff3..9699f0d 100644 --- a/source/css/layout/page.styl +++ b/source/css/layout/page.styl @@ -100,7 +100,7 @@ background: var(--background-color); if (hexo-config('magic.enable') == true) { - magic-style(1.1); + magic-style(1.1, 1.1); } else { border: 1px solid var(--third-text-color); } diff --git a/source/css/layout/tag-content.styl b/source/css/layout/tag-content.styl index 9092960..3e2a2f1 100644 --- a/source/css/layout/tag-content.styl +++ b/source/css/layout/tag-content.styl @@ -6,7 +6,7 @@ background: var(--background-color); if (hexo-config('magic.enable')) { - magic-container(1.02, 30px); + magic-container(1.02, 1.02, 30px); } .tag-name {