diff --git a/_config.yml b/_config.yml index 71f5858..5fd7276 100755 --- a/_config.yml +++ b/_config.yml @@ -334,8 +334,8 @@ style: border-radius: card: 12px block: 12px - button: 8px - image: 8px + bar: 6px + image: 6px color: # 动态颜色(会根据明暗主题重设明度值,只用关心色相和饱和度即可) background: 'hsl(212 16% 98%)' # 浅色背景颜色 diff --git a/layout/404.ejs b/layout/404.ejs index e257eff..240a989 100755 --- a/layout/404.ejs +++ b/layout/404.ejs @@ -16,6 +16,6 @@ page.robots = 'none'; <%- __('page.error.why') %>



- <%- __('page.error.action') %> + <%- __('page.error.action') %> <%- partial('_partial/plugins/comments/layout') %> diff --git a/layout/_partial/cover/wiki_cover.ejs b/layout/_partial/cover/wiki_cover.ejs index 4b93d49..407c9f6 100644 --- a/layout/_partial/cover/wiki_cover.ejs +++ b/layout/_partial/cover/wiki_cover.ejs @@ -39,7 +39,7 @@ function layoutWikiCover() { el += '
' + desc + '
'; } el += '
'; - el += '' + (proj.start || __('btn.getting_started')) + ''; + el += '' + (proj.start || __('btn.getting_started')) + ''; el += '
'; el += ''; el += ''; diff --git a/source/css/_common/blockquote.styl b/source/css/_common/blockquote.styl index e76776a..c0fea92 100644 --- a/source/css/_common/blockquote.styl +++ b/source/css/_common/blockquote.styl @@ -6,5 +6,5 @@ blockquote background: var(--block) $bd-left = 4px border-left: $bd-left solid var(--text-meta) - border-radius: $bd-left $border-button $border-button $bd-left + border-radius: $bd-left $border-bar $border-bar $bd-left color: var(--text-p2) \ No newline at end of file diff --git a/source/css/_common/button.styl b/source/css/_common/button.styl index 56dbe4c..e0ed82a 100644 --- a/source/css/_common/button.styl +++ b/source/css/_common/button.styl @@ -9,7 +9,7 @@ a.button font-weight: 500 line-height: 1 padding: 0.75rem 2rem - border-radius: 3px + border-radius: $border-button trans1: background font-size: $fs-15 &.theme @@ -17,6 +17,10 @@ a.button color: var(--card) &:hover background: $color-hover + &.start + border-radius: 100px + background: var(--text-p1) + color: var(--card) a[onclick]:hover cursor: pointer diff --git a/source/css/_common/highlight.styl b/source/css/_common/highlight.styl index 13ed87d..9e1a78f 100644 --- a/source/css/_common/highlight.styl +++ b/source/css/_common/highlight.styl @@ -34,8 +34,8 @@ p>code:not([class]),li>code:not([class]) span padding: 4px 0.5rem display: block - border-bottom-left-radius: $border-button - border-bottom-right-radius: $border-button + border-bottom-left-radius: $border-bar + border-bottom-right-radius: $border-bar background: var(--block-hover) >table overflow: auto diff --git a/source/css/_custom.styl b/source/css/_custom.styl index 0013374..c0795af 100644 --- a/source/css/_custom.styl +++ b/source/css/_custom.styl @@ -57,8 +57,9 @@ $fs-codeblock = convert(hexo-config('style.font-size.codeblock')) $border-card = convert(hexo-config('style.border-radius.card')) $border-block = convert(hexo-config('style.border-radius.block')) -$border-button = convert(hexo-config('style.border-radius.button')) +$border-bar = convert(hexo-config('style.border-radius.bar')) $border-image = convert(hexo-config('style.border-radius.image')) +$border-button = 4px // 可以动态变化的属性 :root diff --git a/source/css/_defines/func.styl b/source/css/_defines/func.styl index 46ac005..86fcee6 100644 --- a/source/css/_defines/func.styl +++ b/source/css/_defines/func.styl @@ -83,7 +83,7 @@ scrollbar-codeblock($height = 4px) &::-webkit-scrollbar-thumb background: transparent cursor: pointer - border-radius: $border-button + border-radius: $border-bar &:hover &::-webkit-scrollbar-thumb background: var(--text-meta) diff --git a/source/css/_layout/pages/archives.styl b/source/css/_layout/pages/archives.styl index 10e9c70..8c17a5e 100644 --- a/source/css/_layout/pages/archives.styl +++ b/source/css/_layout/pages/archives.styl @@ -47,7 +47,7 @@ &.child padding-left: 2rem padding: .5em 1rem - border-radius: $border-button + border-radius: $border-bar color: var(--text-p2) align-items: center justify-content: space-between diff --git a/source/css/_layout/pages/error.styl b/source/css/_layout/pages/error.styl index b6a67c4..ae9209d 100644 --- a/source/css/_layout/pages/error.styl +++ b/source/css/_layout/pages/error.styl @@ -17,7 +17,6 @@ display: inline-block background: #FDB62F color: black - border-radius: 4px border: 2px solid black @media screen and (max-width: $device-tablet) diff --git a/source/css/_layout/partial/related.styl b/source/css/_layout/partial/related.styl index 98e78ea..5adcf9b 100644 --- a/source/css/_layout/partial/related.styl +++ b/source/css/_layout/partial/related.styl @@ -14,7 +14,7 @@ a.more padding: 0.25rem 0.5rem - border-radius: $border-button + border-radius: $border-bar color: var(--text-p1) article.md-text.content+.related-wrap diff --git a/source/css/_layout/tag-plugins/copy.styl b/source/css/_layout/tag-plugins/copy.styl index 61abfdc..e14438d 100644 --- a/source/css/_layout/tag-plugins/copy.styl +++ b/source/css/_layout/tag-plugins/copy.styl @@ -3,7 +3,7 @@ justify-content: space-between box-sizing: border-box background: var(--block) - border-radius: $border-button + border-radius: $border-bar border: 1px solid var(--block-border) overflow: hidden width: 320px diff --git a/source/css/_layout/tag-plugins/folders.styl b/source/css/_layout/tag-plugins/folders.styl index 0b52690..c17f4d6 100644 --- a/source/css/_layout/tag-plugins/folders.styl +++ b/source/css/_layout/tag-plugins/folders.styl @@ -1,7 +1,7 @@ .tag-plugin.folders display: block margin: 1rem 0 - border-radius: $border-button + border-radius: $border-bar font-size: $fs-14 border: 1px solid var(--theme-border) overflow: hidden diff --git a/source/css/_layout/tag-plugins/folding.styl b/source/css/_layout/tag-plugins/folding.styl index c87d252..7cb20cc 100644 --- a/source/css/_layout/tag-plugins/folding.styl +++ b/source/css/_layout/tag-plugins/folding.styl @@ -2,7 +2,7 @@ details.folding display: block padding: 1rem margin: 1rem 0 - border-radius: $border-button + border-radius: $border-bar font-size: $fs-14 background: var(--theme-bg2) border: 1px solid var(--theme-border) @@ -10,7 +10,7 @@ details.folding cursor: pointer padding: .75rem 1rem margin: 0 - 1rem - border-radius: $border-button + border-radius: $border-bar color: var(--text-p2) font-weight: 500 position: relative @@ -29,6 +29,7 @@ details.folding top: 50% transform: translateY(-50%) right: 1rem + line-height: 1 details.folding[open] @@ -47,8 +48,8 @@ details.folding[open] margin: 0 - 1rem margin-top: 0 background: var(--card) - border-bottom-left-radius: 'calc(%s - 1px)' % $border-button - border-bottom-right-radius: 'calc(%s - 1px)' % $border-button + border-bottom-left-radius: 'calc(%s - 1px)' % $border-bar + border-bottom-right-radius: 'calc(%s - 1px)' % $border-bar font-size: $fs-15 >:first-child margin-top: 0 diff --git a/source/css/_layout/tag-plugins/link.styl b/source/css/_layout/tag-plugins/link.styl index eb89e7a..cd5b3a6 100644 --- a/source/css/_layout/tag-plugins/link.styl +++ b/source/css/_layout/tag-plugins/link.styl @@ -18,7 +18,7 @@ @media screen and (max-width: $device-mobile-375) width: 100% box-shadow: $boxshadow-card - border-radius: $border-button + border-radius: $border-bar trans2: box-shadow transform &:hover box-shadow: $boxshadow-card-float diff --git a/source/css/_layout/tag-plugins/toc.styl b/source/css/_layout/tag-plugins/toc.styl index a2dae79..b7f8e77 100644 --- a/source/css/_layout/tag-plugins/toc.styl +++ b/source/css/_layout/tag-plugins/toc.styl @@ -1,7 +1,7 @@ details.toc background: var(--block) border: 1px solid var(--block-border) - border-radius: $border-button + border-radius: $border-bar overflow: hidden color: var(--text-p2) summary diff --git a/source/css/_layout/widgets/search.styl b/source/css/_layout/widgets/search.styl index 56d17ee..746731f 100644 --- a/source/css/_layout/widgets/search.styl +++ b/source/css/_layout/widgets/search.styl @@ -16,7 +16,7 @@ line-height: 1 box-sizing: border-box font-family: $ff-body - border-radius: $border-button + border-radius: $border-bar background-color: var(--card) color: var(--text-p0) border: 1px solid var(--block-border) @@ -38,7 +38,7 @@ font-size: $fs-14 padding: 2rem background: var(--block) - border-radius: $border-button + border-radius: $border-bar #search-result ul.search-result-list diff --git a/source/css/_layout/widgets/toc_wiki.styl b/source/css/_layout/widgets/toc_wiki.styl index ba585bf..92a04ae 100644 --- a/source/css/_layout/widgets/toc_wiki.styl +++ b/source/css/_layout/widgets/toc_wiki.styl @@ -5,7 +5,7 @@ // 其它分页链接 .widget-wrapper.toc.multi .doc-tree - border-radius: $border-button + border-radius: $border-bar background: var(--block) overflow: hidden border: 1px solid var(--block-border)