diff --git a/scripts/tags/about.js b/scripts/tags/about.js index aff392a..869f61d 100644 --- a/scripts/tags/about.js +++ b/scripts/tags/about.js @@ -10,7 +10,7 @@ 'use strict'; hexo.extend.tag.register('about', function(args, content) { - args = hexo.args.map(args, ['avatar', 'height']); + args = hexo.args.map(args, ['avatar', 'height', 'border']); var rows = hexo.render.renderSync({text: content, engine: 'markdown'}).split('\n'); var el = ''; // wrapper @@ -24,20 +24,15 @@ hexo.extend.tag.register('about', function(args, content) { if (avatar_url) { el += '
' el += ' 0) { - el += ' height="' + args.height + '"/>'; - } else { - el += '/>'; + if (args.border && args.border.length > 0) { + el += ' style="border-radius:' + args.border + '"'; } + if (args.height && args.height.length > 0) { + el += ' height="' + args.height + '"'; + } + el += '/>'; el += '
'; } - // title - if (rows.length > 0) { - // el += '
'; - el += rows.shift(); - // el += '
'; - } - el += ''; // content diff --git a/source/css/_custom.styl b/source/css/_custom.styl index 6780c77..363c036 100644 --- a/source/css/_custom.styl +++ b/source/css/_custom.styl @@ -76,6 +76,13 @@ $border-image = 6px @media screen and (min-width: $device-4k) --width-main: 860px --gap-l: 64px + // iPad 竖屏 + @media screen and (max-width: $device-tablet) + --width-left: 220px + // iPad 竖屏 + @media screen and (max-width: $device-mobile-max) + --width-left: 256px + // shadow diff --git a/source/css/_layout/layout.styl b/source/css/_layout/layout.styl index d658b6e..6fb08f0 100644 --- a/source/css/_layout/layout.styl +++ b/source/css/_layout/layout.styl @@ -19,11 +19,6 @@ max-width: var(--width-main) -// iPad 竖屏 -@media screen and (max-width: $device-tablet) - :root - --width-left: 220px - // 手机布局 @media screen and (max-width: $device-mobile-max) .mobile-only diff --git a/source/css/_layout/tag-plugins/about.styl b/source/css/_layout/tag-plugins/about.styl index bc08de0..1724f2a 100644 --- a/source/css/_layout/tag-plugins/about.styl +++ b/source/css/_layout/tag-plugins/about.styl @@ -1,11 +1,12 @@ .tag-plugin.about background: var(--block) border-radius: $border-card - padding: 3rem 2rem 2rem + padding: 2rem .about-header display flex - justify-content: space-between + justify-content: center flex-wrap: wrap + margin: 1rem 0 2rem img object-fit: contain >img @@ -30,7 +31,6 @@ nav.cap margin-top: 1rem background: var(--card) - border: 1px solid var(--block-border) a color: $color-link &:hover @@ -43,7 +43,8 @@ @media screen and (max-width: $device-mobile) .tag-plugin.about - padding: 2rem 1rem 1rem + padding: 1rem .about-header + margin: 2rem 0 p width 100% diff --git a/source/css/_layout/tag-plugins/friends.styl b/source/css/_layout/tag-plugins/friends.styl index 101deb8..de58fb8 100644 --- a/source/css/_layout/tag-plugins/friends.styl +++ b/source/css/_layout/tag-plugins/friends.styl @@ -17,10 +17,7 @@ margin-top: 2rem .stellar-friends-api display: block - .loading-wrap - min-height: 50px - margin: 2rem 0 - text-align: center + .users-wrap .user-card flex-shrink: 1 diff --git a/source/css/_layout/tag-plugins/timeline.styl b/source/css/_layout/tag-plugins/timeline.styl index e5846ab..0316a56 100644 --- a/source/css/_layout/tag-plugins/timeline.styl +++ b/source/css/_layout/tag-plugins/timeline.styl @@ -1,3 +1,6 @@ +.md .tag-plugin.folding .body:has(.timeline) + background: var(--site-bg) + .md .tag-plugin.timeline position: relative margin-top: 0