From b069788b1625c60467ca76af3ae7a787ec5d6690 Mon Sep 17 00:00:00 2001 From: xugaoyi <894072666@qq.com> Date: Wed, 1 Jun 2022 11:42:01 +0800 Subject: [PATCH] feat: v1.12.0 --- docs/.vuepress/config.ts | 7 ++- package.json | 2 +- vdoing/components/ArchivesPage.vue | 5 ++ vdoing/components/ArticleInfo.vue | 4 ++ vdoing/components/BodyBgImg.vue | 12 +++-- vdoing/components/CategoriesPage.vue | 17 ++++-- vdoing/components/Home.vue | 9 +++- vdoing/components/MainLayout.vue | 7 ++- vdoing/components/Page.vue | 11 ++++ vdoing/components/Pagination.vue | 77 +++++++++++++++------------- vdoing/components/PostList.vue | 20 ++++++-- vdoing/components/RightMenu.vue | 6 ++- vdoing/components/TagsPage.vue | 23 +++++---- vdoing/layouts/Layout.vue | 5 +- vdoing/package.json | 2 +- vdoing/styles/index.styl | 12 ++++- vdoing/styles/palette.styl | 13 ++++- vdoing/styles/wrapper.styl | 1 + vdoing/types/index.ts | 6 +++ 19 files changed, 170 insertions(+), 69 deletions(-) diff --git a/docs/.vuepress/config.ts b/docs/.vuepress/config.ts index 5075a7778d..4875c49bc9 100644 --- a/docs/.vuepress/config.ts +++ b/docs/.vuepress/config.ts @@ -130,12 +130,15 @@ export default defineConfig4CustomTheme({ // archive: false, // 是否打开归档功能,默认true // categoryText: '随笔', // 碎片化文章(_posts文件夹的文章)预设生成的分类值,默认'随笔' + // pageStyle: 'line', // 页面风格,可选值:'card'卡片 | 'line' 线(未设置bodyBgImg时才生效), 默认'card'。 说明:card时背景显示灰色衬托出卡片样式,line时背景显示纯色,并且部分模块带线条边框 + // bodyBgImg: [ // 'https://cdn.jsdelivr.net/gh/xugaoyi/image_store/blog/20200507175828.jpeg', // 'https://cdn.jsdelivr.net/gh/xugaoyi/image_store/blog/20200507175845.jpeg', // 'https://cdn.jsdelivr.net/gh/xugaoyi/image_store/blog/20200507175846.jpeg' - // ], // body背景大图,默认无。 单张图片 String | 多张图片 Array, 多张图片时每隔15秒换一张。 - // bodyBgImgOpacity: 0.5, // body背景图透明度,选值 0.1~ 1.0, 默认0.5 + // ], // body背景大图,默认无。 单张图片 String | 多张图片 Array, 多张图片时隔bodyBgImgInterval切换一张。 + // bodyBgImgOpacity: 0.5, // body背景图透明度,选值 0.1~1.0, 默认0.5 + // bodyBgImgInterval: 15, // body多张背景图时的切换间隔, 默认15,单位s // titleBadge: false, // 文章标题前的图标是否显示,默认true // titleBadgeIcons: [ // 文章标题前图标的地址,默认主题内置图标 // '图标地址1', diff --git a/package.json b/package.json index 80fcbd3545..124177d4d7 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "vuepress-plugin-one-click-copy": "^1.0.2", "vuepress-plugin-thirdparty-search": "^1.0.2", "vuepress-plugin-zooming": "^1.1.7", - "vuepress-theme-vdoing": "^1.11.3", + "vuepress-theme-vdoing": "^1.12.0", "yamljs": "^0.3.0" } } diff --git a/vdoing/components/ArchivesPage.vue b/vdoing/components/ArchivesPage.vue index 4dbd5653f9..9ee64bede3 100644 --- a/vdoing/components/ArchivesPage.vue +++ b/vdoing/components/ArchivesPage.vue @@ -123,6 +123,11 @@ export default { diff --git a/vdoing/components/Home.vue b/vdoing/components/Home.vue index d316ee0a1b..7eececac13 100644 --- a/vdoing/components/Home.vue +++ b/vdoing/components/Home.vue @@ -469,12 +469,13 @@ export default { margin-top 2rem .main-left .card-box - margin-bottom 0.9rem + margin-bottom 2rem .pagination - margin-bottom 4rem + margin-bottom 3rem .theme-vdoing-content padding 0 2rem overflow hidden + border none &>:first-child padding-top 2rem &>:last-child @@ -534,4 +535,8 @@ export default { .feature h2 font-size 1.25rem +.theme-style-line + .main-wrapper + @media (max-width 719px) + margin-top -1px diff --git a/vdoing/components/MainLayout.vue b/vdoing/components/MainLayout.vue index 7cc938d861..40dc89b3f1 100644 --- a/vdoing/components/MainLayout.vue +++ b/vdoing/components/MainLayout.vue @@ -32,7 +32,7 @@ @media (max-width 900px) width 235px .card-box - margin 0 0 0.9rem 0.9rem + margin 0 0 0.8rem 0.8rem padding-top 0.95rem padding-bottom 0.95rem // 719px以下 @@ -56,4 +56,9 @@ margin 0 0 0.9rem 0 border-radius 0 width 100% + .theme-style-line + .main-wrapper + .main-right + .card-box + margin -1px 0 0 0 diff --git a/vdoing/components/Page.vue b/vdoing/components/Page.vue index 2aeae7f018..5d0865c295 100644 --- a/vdoing/components/Page.vue +++ b/vdoing/components/Page.vue @@ -3,6 +3,7 @@
+
* @extend $vdoing-wrapper +.theme-style-line + .page + @media (min-width $MQMobile) + padding-top $navbarHeight + &>* + &:not(.footer) + box-shadow 0 0 + .placeholder + @media (min-width 720px) + height 1.2rem .theme-vdoing-wrapper .content-wrapper position relative diff --git a/vdoing/components/Pagination.vue b/vdoing/components/Pagination.vue index 19573ad746..0a65cd0e33 100644 --- a/vdoing/components/Pagination.vue +++ b/vdoing/components/Pagination.vue @@ -2,36 +2,32 @@