diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 0b5bd2c..0ade6cd 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -48,8 +48,10 @@ module.exports = { // '图标链接2' // ], // postCategory: '随笔', // 碎片化文章(_posts文件夹内)预设生成的分类,默认'随笔' - // categoriesPage: false, // 是否自动生成分类页面(生成在@pages文件夹),默认true + + // categoriesPage: false, // 是否自动生成分类页面(生成在@pages文件夹),默认true。 // tagsPage: false, // 是否自动生成标签页面(生成在@pages文件夹),默认true + // archivesPage: false, // 是否自动生成归档页面(生成在@pages文件夹),默认true author: { // 文章默认的作者信息,可在md文件中单独配置此信息 String | {name: String, href: String} name: 'Evan Xu', // 必需 diff --git a/docs/.vuepress/config/nav.js b/docs/.vuepress/config/nav.js index d0c7d5d..c0b4186 100644 --- a/docs/.vuepress/config/nav.js +++ b/docs/.vuepress/config/nav.js @@ -61,7 +61,8 @@ module.exports = [ items: [ {text: '分类', link: '/categories/'}, {text: '标签', link: '/tags/'}, - {text: '时间轴', link: '/timeline/'}, + {text: '归档', link: '/archives/'}, + {text: '时间轴(准备弃用)', link: '/timeline/'}, ] } ] \ No newline at end of file diff --git a/docs/@pages/archivesPage.md b/docs/@pages/archivesPage.md new file mode 100644 index 0000000..c021f6b --- /dev/null +++ b/docs/@pages/archivesPage.md @@ -0,0 +1,6 @@ +--- +archivesPage: true +title: 归档 +permalink: /archives/ +article: false +--- \ No newline at end of file diff --git a/docs/@pages/categoriesPage.md b/docs/@pages/categoriesPage.md index 15f359b..e69ff98 100644 --- a/docs/@pages/categoriesPage.md +++ b/docs/@pages/categoriesPage.md @@ -3,4 +3,4 @@ categoriesPage: true title: 分类 permalink: /categories/ article: false ---- +--- \ No newline at end of file diff --git a/docs/@pages/tagsPage.md b/docs/@pages/tagsPage.md index 943f890..cf1bde5 100644 --- a/docs/@pages/tagsPage.md +++ b/docs/@pages/tagsPage.md @@ -3,4 +3,4 @@ tagsPage: true title: 标签 permalink: /tags/ article: false ---- +--- \ No newline at end of file diff --git a/theme-vdoing/components/ArchivesPage.vue b/theme-vdoing/components/ArchivesPage.vue new file mode 100644 index 0000000..5f1c248 --- /dev/null +++ b/theme-vdoing/components/ArchivesPage.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/theme-vdoing/components/CategoriesBar.vue b/theme-vdoing/components/CategoriesBar.vue index b85f45e..33a3251 100644 --- a/theme-vdoing/components/CategoriesBar.vue +++ b/theme-vdoing/components/CategoriesBar.vue @@ -28,6 +28,8 @@ export default { diff --git a/theme-vdoing/components/Footer.vue b/theme-vdoing/components/Footer.vue index 7bb020d..5bbc96d 100644 --- a/theme-vdoing/components/Footer.vue +++ b/theme-vdoing/components/Footer.vue @@ -12,7 +12,7 @@ - + Theme by Vdoing @@ -85,12 +101,12 @@ import NavLink from "@theme/components/NavLink"; import BScroll from "@better-scroll/core" import Slide from "@better-scroll/slide" +import MainLayout from '@theme/components/MainLayout' import PostList from '@theme/components/PostList' import Pagination from '@theme/components/Pagination' import BloggerBar from '@theme/components/BloggerBar' import CategoriesBar from '@theme/components/CategoriesBar' import TagsBar from '@theme/components/TagsBar' -import Footer from '@theme/components/Footer' const MOBILE_DESKTOP_BREAKPOINT = 720 // refer to config.styl @@ -110,7 +126,7 @@ export default { currentPage: 1// 当前页 } }, - components: { NavLink, PostList, BloggerBar, CategoriesBar, TagsBar, Pagination, Footer }, + components: { NavLink, MainLayout, PostList, BloggerBar, CategoriesBar, TagsBar, Pagination }, created() { this.total = this.$sortPosts.length }, @@ -328,25 +344,8 @@ export default { &.active background #517EA9 - .main-wrapper - margin 2rem auto - max-width $homePageWidth - position relative - display flex - .main-left - flex 1 - > * - margin-bottom 4rem - .post-list .card-box,.theme-vdoing-content.card-box - padding 1rem 1.5rem - margin-bottom .9rem - .home-content - padding 1rem 1.5rem 0 - .main-right - width 280px - .card-box - margin 0 0 .9rem .9rem - padding .95rem + // .main-wrapper + // margin 2rem auto .footer background none diff --git a/theme-vdoing/components/MainLayout.vue b/theme-vdoing/components/MainLayout.vue new file mode 100644 index 0000000..cf3278e --- /dev/null +++ b/theme-vdoing/components/MainLayout.vue @@ -0,0 +1,30 @@ + + diff --git a/theme-vdoing/components/Page.vue b/theme-vdoing/components/Page.vue index 1d8888a..1ccf7ed 100644 --- a/theme-vdoing/components/Page.vue +++ b/theme-vdoing/components/Page.vue @@ -31,7 +31,6 @@ -