valaxy-theme-yun 0.6.1 → 0.6.2

package/components/ValaxyMain.vue

@@ -16,7 +16,7 @@ const title = usePostTitle(computed(() => props.frontmatter))
 <template>
   <main class="yun-main lt-md:ml-0" flex="~">
     <div w="full" flex="~">
-      <slot name="main-content">
+      <slot name="main">
         <div class="content" flex="~ col grow" w="full" p="l-4 lt-md:0">
           <YunCard :cover="frontmatter.cover" m="0" class="relative" :style="styles">
             <slot name="main-header">
@@ -25,6 +25,7 @@ const title = usePostTitle(computed(() => props.frontmatter))
             <slot name="main-header-after" />
 
             <div p="x-4 b-8" class="sm:px-6 lg:px-12 xl:px-16" w="full">
+              <slot name="main-content" />
               <ValaxyMd :frontmatter="frontmatter">
                 <slot name="main-content-md" />
                 <slot />
@@ -32,6 +33,8 @@ const title = usePostTitle(computed(() => props.frontmatter))
             </div>
           </YunCard>
 
+          <slot name="main-content-after" />
+
           <slot name="main-nav">
             <YunPostNav v-if="frontmatter.nav !== false" />
           </slot>

package/components/YunAside.vue

@@ -26,7 +26,6 @@ const app = useAppStore()
         {{ t('sidebar.toc') }}
       </h2>
 
-      <!-- <ValaxyToc v-if="frontmatter.toc !== false" /> -->
       <YunToc v-if="frontmatter.toc !== false" :headers="data.headers || []" />
 
       <div class="flex-grow" />

package/layouts/archives.vue

@@ -12,10 +12,10 @@ const title = usePostTitle(frontmatter)
 
 <template>
   <Base>
-    <template #header>
+    <template #main-header>
       <YunPageHeader :title="title || t('menu.archives')" :icon="frontmatter.icon || 'i-ri-archive-line'" :color="frontmatter.color" />
     </template>
-    <template #content>
+    <template #main-content>
       <router-view />
       <YunPostCollapse :posts="postList" />
     </template>

package/layouts/base.vue

@@ -20,12 +20,22 @@ const config = useConfig()
 
   <router-view v-slot="{ Component }">
     <component :is="Component">
+      <template #main-header>
+        <slot name="main-header" />
+      </template>
+
       <template #main-header-after>
         <slot name="main-header-after" />
       </template>
       <template #main>
         <slot name="main" />
       </template>
+      <template #main-content>
+        <slot name="main-content" />
+      </template>
+      <template #main-content-after>
+        <slot name="main-content-after" />
+      </template>
       <template #aside-custom>
         <slot name="aside-custom" />
       </template>

package/layouts/categories.vue

@@ -47,14 +47,14 @@ const title = usePostTitle(frontmatter)
 
 <template>
   <Base>
-    <template #header>
+    <template #main-header>
       <YunPageHeader
         :title="title || t('menu.categories')"
         :icon="frontmatter.icon || 'i-ri-folder-2-line'"
         :color="frontmatter.color"
       />
     </template>
-    <template #content>
+    <template #main-content>
       <div text="center" class="yun-text-light" p="2">
         {{ t('counter.categories', categories.children!.size) }}
       </div>
@@ -62,9 +62,11 @@ const title = usePostTitle(frontmatter)
       <router-view />
     </template>
 
-    <YunCard v-if="curCategory" ref="collapse" m="t-4" w="full">
-      <YunPageHeader :title="curCategory === 'Uncategorized' ? t('category.uncategorized') : curCategory" icon="i-ri-folder-open-line" />
-      <YunPostCollapse w="full" m="b-4" p="x-20 lt-sm:x-5" :posts="posts" />
-    </YunCard>
+    <template #main-content-after>
+      <YunCard v-if="curCategory" ref="collapse" m="t-4" w="full">
+        <YunPageHeader :title="curCategory === 'Uncategorized' ? t('category.uncategorized') : curCategory" icon="i-ri-folder-open-line" />
+        <YunPostCollapse w="full" m="b-4" p="x-20 lt-sm:x-5" :posts="posts" />
+      </YunCard>
+    </template>
   </Base>
 </template>

package/layouts/tags.vue

@@ -49,14 +49,14 @@ const title = usePostTitle(frontmatter)
 
 <template>
   <Base>
-    <template #header>
+    <template #main-header>
       <YunPageHeader
         :title="title || t('menu.tags')"
         :icon="frontmatter.icon || 'i-ri-tag-line'"
         :color="frontmatter.color"
       />
     </template>
-    <template #content>
+    <template #main-content>
       <div class="yun-text-light" text="center" p="2">
         {{ t('counter.tags', Array.from(tags).length) }}
       </div>
@@ -70,10 +70,12 @@ const title = usePostTitle(frontmatter)
       <router-view />
     </template>
 
-    <YunCard v-if="curTag" ref="collapse" m="t-4" w="full">
-      <YunPageHeader :title="curTag" icon="i-ri-hashtag" />
-      <YunPostCollapse w="full" m="b-4" p="x-20 lt-sm:x-5" :posts="posts" />
-    </YunCard>
+    <template #main-content-after>
+      <YunCard v-if="curTag" ref="collapse" m="t-4" w="full">
+        <YunPageHeader :title="curTag" icon="i-ri-hashtag" />
+        <YunPostCollapse w="full" m="b-4" p="x-20 lt-sm:x-5" :posts="posts" />
+      </YunCard>
+    </template>
   </Base>
 </template>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -18,7 +18,7 @@
     "@iconify-json/simple-icons": "^1.1.16"
   },
   "devDependencies": {
-    "valaxy": "0.6.1"
+    "valaxy": "0.6.2"
   },
   "scripts": {
     "build": "tsup",

package/styles/layout/index.scss

@@ -2,14 +2,7 @@
 @use "./post" as *;
 
 .yun-main {
-  // margin: 0;
   padding-left: var(--va-sidebar-width-mobile);
   transition: padding-left var(--va-transition-duration);
-
-  box-sizing: content-box;
-
-  // max-width: calc(100vw - var(--va-sidebar-width-mobile));
-  // max-width: calc(100vw - 2 * var(--va-sidebar-width-mobile) - 1rem - 8px);
+  box-sizing: border-box;
 }
-
-// @include xl