From d0184c21bb200d6a48588495933ff59a4c1640f5 Mon Sep 17 00:00:00 2001 From: ppoffice Date: Sun, 12 Apr 2020 14:20:49 -0400 Subject: [PATCH] fix(*): minor layout and style fixes - allow empty profile social_links - fix code block font size on iOS safari --- README.md | 2 +- include/schema/common/plugins.json | 2 +- include/style/base.styl | 6 ++++++ include/style/responsive.styl | 14 +++++++------- layout/widget/profile.jsx | 6 +++--- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 547cfeb..1cb6cd1 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ blog feature-rich and powerful. Search Share Widgets - Other Plugins + Other Plugins Changyan diff --git a/include/schema/common/plugins.json b/include/schema/common/plugins.json index c095e02..a3d85c6 100644 --- a/include/schema/common/plugins.json +++ b/include/schema/common/plugins.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema#", "$id": "/common/plugins.json", - "description": "Plugin configurations", + "description": "Plugin configurations\nhttps://ppoffice.github.io/hexo-theme-icarus/categories/Plugins/", "type": "object", "properties": { "animejs": { diff --git a/include/style/base.styl b/include/style/base.styl index 25e1e8a..c94cbf0 100644 --- a/include/style/base.styl +++ b/include/style/base.styl @@ -58,3 +58,9 @@ $colors = merge($colors, $custom-colors) @import bulma-stylus-root + '/form/_all' @import bulma-stylus-root + '/grid/_all' @import bulma-stylus-root + '/layout/_all' + +html + -webkit-text-size-adjust: 100% + -moz-text-size-adjust: 100% + -ms-text-size-adjust: 100% + text-size-adjust: 100% diff --git a/include/style/responsive.styl b/include/style/responsive.styl index ec4d57e..ad6be4d 100644 --- a/include/style/responsive.styl +++ b/include/style/responsive.styl @@ -16,16 +16,16 @@ width: $desktop - 2 * $gap +tablet() + .is-sticky + position: -webkit-sticky + position: sticky + top: 1.5rem + z-index: 99 + .column-main, .column-left, .column-right, .column-right-shadow &.is-sticky - align-self: flex-start - position: -webkit-sticky - position: sticky top: .75rem - - .column-right-shadow - &.is-sticky - top: 1.5rem + align-self: flex-start +mobile() .section diff --git a/layout/widget/profile.jsx b/layout/widget/profile.jsx index abccc36..ba4e44d 100644 --- a/layout/widget/profile.jsx +++ b/layout/widget/profile.jsx @@ -75,7 +75,7 @@ class Profile extends Component { {followLink ?
{followTitle}
: null} - {this.renderSocialLinks(socialLinks)} + {socialLinks ? this.renderSocialLinks(socialLinks) : null} ; } @@ -109,7 +109,7 @@ Profile.Cacheable = cacheComponent(Profile, 'widget.profile', props => { const categoryCount = site.categories.filter(category => category.length).length; const tagCount = site.tags.filter(tag => tag.length).length; - const socialLinks = Object.keys(social_links).map(name => { + const socialLinks = social_links ? Object.keys(social_links).map(name => { const link = social_links[name]; if (typeof link === 'string') { return { @@ -122,7 +122,7 @@ Profile.Cacheable = cacheComponent(Profile, 'widget.profile', props => { url: url_for(link.url), icon: link.icon }; - }); + }) : null; return { avatar: getAvatar(),