valaxy-theme-yun 0.20.0-beta.5 → 0.20.0-beta.6

package/components/ValaxyMain.vue

@@ -45,17 +45,18 @@ onContentUpdated(() => {
         }" flex="~ col grow"
         p="lt-md:0"
       >
-        <YunCard :cover="frontmatter.cover" m="0" class="relative pt-8" :style="styles as StyleValue">
-          <slot name="main-header">
-            <YunPageHeader
-              class="mb-2"
-              :title="title"
-              :icon="frontmatter.icon || icon"
-              :color="frontmatter.color || color"
-              :cover="frontmatter.cover"
-              :page-title-class="frontmatter.pageTitleClass"
-            />
-          </slot>
+        <YunCard :cover="frontmatter.cover" m="0" class="relative" :style="styles as StyleValue">
+          <div class="mt-8 mb-4">
+            <slot name="main-header">
+              <YunPageHeader
+                :title="title"
+                :icon="frontmatter.icon || icon"
+                :color="frontmatter.color || color"
+                :cover="frontmatter.cover"
+                :page-title-class="frontmatter.pageTitleClass"
+              />
+            </slot>
+          </div>
           <slot name="main-header-after" />
 
           <div p="x-4 b-8" class="sm:px-6 lg:px-12 xl:px-16" w="full">
@@ -97,14 +98,6 @@ onContentUpdated(() => {
 <style lang="scss">
 @use 'valaxy/client/styles/mixins/index.scss' as *;
 
-@include screen('md') {
-  .yun-main {
-    &.has-sidebar {
-      padding-left: var(--va-sidebar-width);
-    }
-  }
-}
-
 @include screen('xl') {
   .content{
     // 8px scrollbar width

package/components/layout/YunLayoutWrapper.vue

@@ -1,16 +1,12 @@
 <script setup lang="ts">
-import { useYunAppStore } from '../../stores'
-
-const yun = useYunAppStore()
+// common layout
 </script>
 
 <template>
   <div
     flex="~"
-    class="mt-24 md:mt-36 w-full max-w-screen-2xl m-auto justify-center items-start gap-4"
-    :class="{
-      'flex-col': yun.size.isXs,
-    }"
+    m="t-24 md:t-36"
+    class="w-full max-w-screen-2xl m-auto justify-center items-start gap-4"
   >
     <slot />
   </div>

package/layouts/home.vue

@@ -1,10 +1,8 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
-import { useYunAppStore } from '../stores'
 import { useThemeConfig } from '../composables'
 
-const yunStore = useYunAppStore()
 const route = useRoute()
 const themeConfig = useThemeConfig()
 
@@ -17,16 +15,7 @@ const showNotice = computed(() => {
 </script>
 
 <template>
-  <main
-    class="yun-main flex-center"
-    :class="{
-      'pl-0': !yunStore.leftSidebar.isOpen,
-      'md:pl-$va-sidebar-width': yunStore.leftSidebar.isOpen,
-      'pt-36': isPage,
-    }" flex="~ col" w="full"
-  >
-    <YunSidebar :show-hamburger="true" />
-
+  <YunLayoutWrapper class="items-center mt-0! flex-col">
     <template v-if="!isPage">
       <YunBanner />
       <YunSay v-if="themeConfig.say.enable" w="full" />
@@ -49,5 +38,5 @@ const showNotice = computed(() => {
     </slot>
 
     <YunFooter />
-  </main>
+  </YunLayoutWrapper>
 </template>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.20.0-beta.5",
+  "version": "0.20.0-beta.6",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -19,6 +19,9 @@
   },
   "main": "index.ts",
   "module": "index.ts",
+  "scripts": {
+    "release": "bumpp && npm publish"
+  },
   "dependencies": {
     "@ctrl/tinycolor": "^4.1.0",
     "@explosions/fireworks": "^0.1.0",
@@ -32,10 +35,7 @@
   },
   "devDependencies": {
     "@types/animejs": "^3.1.12",
-    "valaxy-addon-waline": "0.2.0",
-    "valaxy": "0.20.0-beta.5"
-  },
-  "scripts": {
-    "release": "bumpp && npm publish"
+    "valaxy": "workspace:*",
+    "valaxy-addon-waline": "workspace:*"
   }
-}
+}

package/styles/layout/index.scss

@@ -6,8 +6,3 @@
 html {
   overflow-y: scroll;
 }
-
-.yun-main {
-  transition: padding-left var(--va-transition-duration);
-  transition-timing-function: map.get($cubic-bezier, 'ease-in-out');
-}

package/unocss.config.ts

@@ -2,7 +2,6 @@ import { defineConfig } from 'unocss'
 
 export default defineConfig({
   shortcuts: [
-    ['yun-main', 'lt-md:pl-0'],
     ['yun-card', 'transition yun-transition shadow hover:shadow-lg'],
   ],
   rules: [