diff --git a/assets/css/_common/components/back-to-top.scss b/assets/css/_common/components/back-to-top.scss index 97316c8..e777bcf 100644 --- a/assets/css/_common/components/back-to-top.scss +++ b/assets/css/_common/components/back-to-top.scss @@ -1,14 +1,14 @@ -@if hexo-config('back2top.enable') { +@if $back2top_enable { .back-to-top { font-size: $b2t-font-size; - @if not hexo-config('back2top.scrollpercent') { + @if not $back2top_scrollpercent { span { display: none; } } - @if hexo-config('back2top.sidebar') { + @if $back2top_sidebar { margin: 20px - $sidebar-offset -10px -20px; opacity: 0; transition: opacity $transition-ease; @@ -29,7 +29,7 @@ transition: bottom $transition-ease; @include sidebar-toggle(); - @if not hexo-config('back2top.scrollpercent') { + @if not $back2top_scrollpercent { width: 24px; } diff --git a/assets/css/_common/components/pages/tag-cloud.scss b/assets/css/_common/components/pages/tag-cloud.scss index 7934c6a..011834b 100644 --- a/assets/css/_common/components/pages/tag-cloud.scss +++ b/assets/css/_common/components/pages/tag-cloud.scss @@ -15,7 +15,7 @@ } } -@if hexo-config('darkmode') { +@if $darkmode { @media (prefers-color-scheme: dark) { @for $tag-cloud from 0 through 10 { $tag-cloud-color : mix($tag-cloud-end-dark, $tag-cloud-start-dark, $tag-cloud * 10); diff --git a/assets/css/_common/components/post/index.scss b/assets/css/_common/components/post/index.scss index a3bc4a2..34044f4 100644 --- a/assets/css/_common/components/post/index.scss +++ b/assets/css/_common/components/post/index.scss @@ -17,25 +17,25 @@ } .use-motion { - @if hexo-config('motion.transition.post_block') { + @if $motion_trans_post_block { .post-block, .pagination, .comments { visibility: hidden; } } - @if hexo-config('motion.transition.post_header') { + @if $motion_trans_post_header { .post-header { visibility: hidden; } } - @if hexo-config('motion.transition.post_body') { + @if $motion_trans_post_body { .post-body { visibility: hidden; } } - @if hexo-config('motion.transition.coll_header') { + @if $motion_trans_coll_header { .collection-header { visibility: hidden; } diff --git a/assets/css/_common/components/post/post-body.scss b/assets/css/_common/components/post/post-body.scss index 0f96b5d..062d816 100644 --- a/assets/css/_common/components/post/post-body.scss +++ b/assets/css/_common/components/post/post-body.scss @@ -7,11 +7,11 @@ } @include desktop() { - text-align: unquote(hexo-config('text_align.desktop')); + text-align: unquote($text_align_desktop); } @include tablet-mobile() { - text-align: unquote(hexo-config('text_align.mobile')); + text-align: unquote($text_align_mobile); } h1, h2, h3, h4, h5, h6 { diff --git a/assets/css/_common/components/post/post-followme.scss b/assets/css/_common/components/post/post-followme.scss index 7974b3f..34cfec9 100644 --- a/assets/css/_common/components/post/post-followme.scss +++ b/assets/css/_common/components/post/post-followme.scss @@ -1,4 +1,4 @@ -@if hexo-config('follow_me') { +@if $follow_me { .followme { color: $grey; padding: 1em 1.5em; diff --git a/assets/css/_common/components/post/post-footer.scss b/assets/css/_common/components/post/post-footer.scss index 2726dab..fa231a5 100644 --- a/assets/css/_common/components/post/post-footer.scss +++ b/assets/css/_common/components/post/post-footer.scss @@ -18,7 +18,7 @@ } } -@if hexo-config('creative_commons.post') { +@if $creative_commons_post { .post-copyright ul { list-style: none; padding: .5em 1em; diff --git a/assets/css/_common/components/post/post-header.scss b/assets/css/_common/components/post/post-header.scss index b3872d2..3c7eb44 100644 --- a/assets/css/_common/components/post/post-header.scss +++ b/assets/css/_common/components/post/post-header.scss @@ -10,7 +10,7 @@ margin: initial; @include word-wrap(); - @if hexo-config('post_edit.enable') { + @if $post_edit_enable { .post-edit-link { border-bottom: 0; color: $grey; @@ -99,7 +99,7 @@ } .post-meta-item-text { - @if not hexo-config('post_meta.item_text') { + @if not $post_meta_item_text { display: none; } @@ -113,7 +113,7 @@ height: 0; } -@if hexo-config('busuanzi_count.enable') and hexo-config('busuanzi_count.post_views') { +@if $busuanzi_enable and $busuanzi_post_views { #busuanzi_container_page_pv { display: none; } diff --git a/assets/css/_common/components/post/post-reward.scss b/assets/css/_common/components/post/post-reward.scss index 16fdc12..d96301e 100644 --- a/assets/css/_common/components/post/post-reward.scss +++ b/assets/css/_common/components/post/post-reward.scss @@ -28,7 +28,7 @@ display: block; } - @if hexo-config('reward_settings.animation') { + @if $reward_settings_animation { &:hover span { animation: next-roll .1s infinite linear; // The animation may affect :hover of img in dark mode diff --git a/assets/css/_schemes/Muse/_sidebar.scss b/assets/css/_schemes/Muse/_sidebar.scss index d1651f5..27aff87 100644 --- a/assets/css/_schemes/Muse/_sidebar.scss +++ b/assets/css/_schemes/Muse/_sidebar.scss @@ -1,4 +1,4 @@ -@if hexo-config('sidebar.position') == 'right' { +@if $sidebar_position == 'right' { .sidebar-active { @include desktop() { padding-right: $sidebar-desktop; @@ -31,7 +31,7 @@ .sidebar { background: $black-deep; bottom: 0; - @if not hexo-config('back2top.sidebar') { + @if not $back2top_sidebar { box-shadow: inset 0 2px 6px black; } position: fixed; @@ -63,7 +63,7 @@ margin-right: 10px; vertical-align: middle; - @if hexo-config('social_icons.transition') { + @if $social_icons_transition { transition: all $transition-ease; } @@ -78,7 +78,7 @@ } .links-of-blogroll-item { - @if hexo-config('links_settings.layout') == 'inline' { + @if $links_settings_layout == 'inline' { display: inline-block; } padding: 2px 10px; diff --git a/assets/css/_schemes/Pisces/_layout.scss b/assets/css/_schemes/Pisces/_layout.scss index aa4a732..621ee85 100644 --- a/assets/css/_schemes/Pisces/_layout.scss +++ b/assets/css/_schemes/Pisces/_layout.scss @@ -18,7 +18,7 @@ justify-content: space-between; @include main-container(); - @if hexo-config('sidebar.position') == 'right' { + @if $sidebar_position == 'right' { flex-direction: row-reverse; } @@ -40,7 +40,7 @@ } .footer-inner { - @if hexo-config('sidebar.position') == 'right' { + @if $sidebar_position == 'right' { padding-right: $sidebar-desktop + $sidebar-offset; } @else { padding-left: $sidebar-desktop + $sidebar-offset; diff --git a/assets/css/_schemes/Pisces/_menu.scss b/assets/css/_schemes/Pisces/_menu.scss index a3c396d..abacc7b 100644 --- a/assets/css/_schemes/Pisces/_menu.scss +++ b/assets/css/_schemes/Pisces/_menu.scss @@ -31,7 +31,7 @@ } } -@if not hexo-config('menu_settings.badges') { +@if not $menu_settings_badges { .main-menu .menu-item-active::after { background: $grey; border-radius: 50%; diff --git a/assets/css/_schemes/Pisces/_sidebar.scss b/assets/css/_schemes/Pisces/_sidebar.scss index 775e9e0..be53aa0 100644 --- a/assets/css/_schemes/Pisces/_sidebar.scss +++ b/assets/css/_schemes/Pisces/_sidebar.scss @@ -10,7 +10,7 @@ display: none; } - @if hexo-config('motion.enable') and hexo-config('motion.transition.sidebar') { + @if $motion_enable and $motion_transition_sidebar { visibility: hidden; } } @@ -56,7 +56,7 @@ .links-of-author-item { @include sidebar-inline-links-item(); - @if not hexo-config('social_icons.icons_only') { + @if not $social_icons_only { width: 50%; } @@ -72,14 +72,14 @@ } .links-of-blogroll-item { - @if hexo-config('links_settings.layout') == 'inline' { + @if $links_settings_layout == 'inline' { display: inline-block; max-width: 100%; @include sidebar-inline-links-item(); } } -@if hexo-config('back2top.sidebar') { +@if $back2top_sidebar { // Only when back2top.sidebar is true, apply the following styles .back-to-top { background: var(--body-bg-color); diff --git a/assets/css/_sitevars.scss b/assets/css/_sitevars.scss index 28bd92b..566fb43 100644 --- a/assets/css/_sitevars.scss +++ b/assets/css/_sitevars.scss @@ -13,9 +13,10 @@ $theme_color_dark: {{ $P.themeColor.dark }}; $theme_color_light: {{ $P.themeColor.light }}; // Header -$bookmark_enable: {{ $P.bookmark.enable }}; $bookmark_color: {{ $P.bookmark.color }}; +$bookmark_enable: {{ $P.bookmark.enable }}; $github_banner_enable: {{ $P.githubBanner.enable }}; +$menu_settings_badges: {{ $P.menuSets.badges }}; // Footer $footer_icon_color: {{ $P.footer.icon.color }}; @@ -26,6 +27,7 @@ $footer_beian_enable: {{ $P.footer.beian.enable }}; $busuanzi_enable: {{ $P.busuanzi.enable }}; $busuanzi_visitors: {{ $P.busuanzi.visitors }}; $busuanzi_views: {{ $P.busuanzi.views }}; +$busuanzi_post_views: {{ $P.busuanzi.postViews }}; // Font $font_enable: {{ $P.font.enable }}; @@ -48,15 +50,39 @@ $sidebar_padding: {{ $P.sidebar.padding }}; $sidebar_position: {{ $P.sidebar.position }}; $sidebar_width: {{ $P.sidebar.width }}; +$motion_enable: {{ $P.motion.enable }}; +$motion_transition_sidebar: {{ $P.motion.transition.sidebar }}; + +$back2top_enable: {{ $P.backTop.enable }}; +$back2top_scrollpercent: {{ $P.backTop.scrollpercent }}; +$back2top_sidebar: {{ $P.backTop.sidebar }}; + $avatar_rotated: {{ $P.avatar.rotated }}; $avatar_rounded: {{ $P.avatar.rounded }}; $avatar_rounded: {{ $P.avatar.rounded }}; $site_state: {{ $P.siteState }}; $social_icons_only: {{ $P.socialIcons.iconsOnly }}; +$social_icons_transition: {{ $P.socialIcons.transition }}; +$links_settings_layout: {{ $P.linksSets.layout }}; $toc_enable: {{ $P.toc.enable }}; $toc_expand_all: {{ $P.toc.expandAll }}; $toc_wrap: {{ $P.toc.wrap }}; +// Posts +$creative_commons_post: {{ $P.creativeCommons.post }}; +$follow_me: {{ isset $P "followMe" }}; +$motion_trans_coll_header: {{ $P.motion.transition.collHeader }}; +$motion_trans_post_block: {{ $P.motion.transition.postBlock }}; +$motion_trans_post_body: {{ $P.motion.transition.postBody }}; +$motion_trans_post_header: {{ $P.motion.transition.postHeader }}; +$post_edit_enable: {{ $P.postEdit.enable }}; +$post_meta_item_text: {{ $P.postMeta.itemText }}; +$reward_settings_animation: {{ $P.rewardSets.animation }}; + +// TODO find the paramters +$text_align_desktop: center; +$text_align_mobile: center; + // Note $note_icons: {{ $P.note.icons }}; $note_light_bg_offset: {{ $P.note.lightBgOffset }}; diff --git a/assets/css/main.scss b/assets/css/main.scss index 19af1fd..9db36b8 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -35,7 +35,7 @@ // Schemes Layer // -------------------------------------------------- -// @import '"_schemes/" + theme.scheme'; +@import '_schemes/Gemini/'; // Custom Layer diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index 4b21365..f4e2bd1 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -66,7 +66,7 @@ params: # Creative Commons 4.0 International License. # See: https://creativecommons.org/about/cclicenses/ - creative_commons: + creativeCommons: # Available values: by | by-nc | by-nc-nd | by-nc-sa | by-nd | by-sa | cc-zero license: by-nc-sa # Available values: big | small @@ -110,7 +110,7 @@ params: #commonweal: /404/ || fa fa-heartbeat # Enable / Disable menu icons / item badges. - menu_settings: + menuSets: icons: true badges: false @@ -176,7 +176,7 @@ params: transition: false # Blog rolls - links_settings: + linksSets: icon: fa fa-globe title: Links # Available values: block | inline @@ -251,12 +251,12 @@ params: read_more_btn: true # Post meta display settings - post_meta: - item_text: true - created_at: true - updated_at: + postMeta: + itemText: true + created: true + updated: enable: true - another_day: true + anotherDay: true categories: true # Post wordcount display settings @@ -270,7 +270,7 @@ params: # Donate (Sponsor) settings # Front-matter variable (nonsupport animation). - reward_settings: + rewardSets: # If true, a donate button will be displayed in every article by default. enable: false animation: false @@ -284,8 +284,8 @@ params: # Subscribe through Telegram Channel, Twitter, etc. # Usage: `Key: permalink || icon` (Font Awesome) - follow_me: - #Twitter: https://twitter.com/username || fab fa-twitter + followMe: + Twitter: https://twitter.com/username || fab fa-twitter #Telegram: https://t.me/channel_name || fab fa-telegram #WeChat: /images/wechat_channel.jpg || fab fa-weixin #RSS: /atom.xml || fa fa-rss @@ -299,14 +299,14 @@ params: # Post edit # Easily browse and edit blog source code online. - post_edit: + postEdit: enable: false url: https://github.com/user-name/repo-name/tree/branch-name/subdirectory-name/ # Link for view source #url: https://github.com/user-name/repo-name/edit/branch-name/subdirectory-name/ # Link for fork & edit # Show previous post and next post in post footer if exists # Available values: left | right | false - post_navigation: left + postNavigation: left # --------------------------------------------------------------- @@ -381,7 +381,7 @@ params: # Available values: default | flat | mac style: default - back2top: + backTop: enable: true # Back to top in sidebar. sidebar: false @@ -849,10 +849,10 @@ params: async: false transition: # All available transition variants: https://theme-next.js.org/animate/ - post_block: fadeIn - post_header: fadeInDown - post_body: fadeInDown - coll_header: fadeInLeft + postBlock: fadeIn + postHeader: fadeInDown + postBody: fadeInDown + collHeader: fadeInLeft # Only for Pisces | Gemini. sidebar: fadeInUp