valaxy 0.22.6 → 0.22.8

package/client/main.ts

@@ -12,19 +12,9 @@ import AppLink from './components/AppLink.vue'
 import setupMain from './setup/main'
 
 import { setupValaxyDevTools } from './utils/dev'
-// reset styles, load css before app
-// import '@unocss/reset/tailwind.css'
-// https://unocss.dev/guide/style-reset#tailwind-compat
-// minus the background color override for buttons to avoid conflicts with UI frameworks
-import '@unocss/reset/tailwind-compat.css'
 
-// css
-import './styles/css/css-vars.css'
-
-import './styles/css/main.css'
 // generate user styles
-import '/@valaxyjs/styles'
-import 'uno.css'
+import '#valaxy/styles'
 
 const valaxyConfig = initValaxyConfig()
 

package/client/shims.d.ts

@@ -1,3 +1,10 @@
+// Types for virtual modules
+// `#valaxy/*` is an alias for `/@valaxyjs/*`, because TS will consider `/@valaxyjs/*` as an absolute path that we can't override
+
 declare module 'virtual:valaxy-theme' {
   export default any
 }
+
+declare module '#valaxy/styles' {
+  // side-effects only
+}

package/client/styles/css-vars.scss

@@ -66,6 +66,27 @@ html.dark {
   --va-c-text-3: rgba(235, 235, 245, 0.38);
 }
 
+// bg
+:root {
+  --va-c-bg: #ffffff;
+  --va-c-bg-light: #ffffff;
+  --va-c-bg-dark: #fafafa;
+  --va-c-bg-opacity: rgba(255, 255, 255, 0.8);
+  --va-c-bg-soft: #f9f9f9;
+  --va-c-bg-alt: #f9f9f9;
+  --va-c-bg-mute: #f1f1f1;
+}
+
+html.dark {
+  --va-c-bg: #1a1a1d;
+  --va-c-bg-light: #202127;
+  --va-c-bg-dark: #1a1a1a;
+  --va-c-bg-opacity: rgba(0, 0, 0, 0.8);
+  --va-c-bg-alt: #161618;
+  --va-c-bg-soft: #202127;
+  --va-c-bg-mute: #2f2f2f;
+}
+
 /* code */
 :root {
   --va-code-line-height: 1.7;

package/client/styles/index.scss

@@ -10,3 +10,18 @@ $c-primary: #0078e7 !default;
 @use "css-i18n/src/styles/index.scss" as *;
 
 // components import by yourself
+html,
+body,
+#app {
+  margin: 0;
+  padding: 0;
+  line-height: 2;
+}
+
+html {
+  background-color: var(--va-c-bg);
+}
+
+a {
+  cursor: pointer;
+}

package/client/utils/router.ts

@@ -47,8 +47,8 @@ export function scrollTo(el: HTMLElement, hash: string, options: Partial<ScrollT
     const targetPadding = options?.targetPadding || -64
     const targetTop
       = window.scrollY
-      + (target as HTMLElement).getBoundingClientRect().top
-      + targetPadding
+        + (target as HTMLElement).getBoundingClientRect().top
+        + targetPadding
 
     // only smooth scroll if distance is smaller than screen height.
     if (!options.smooth || Math.abs(targetTop - window.scrollY) > window.innerHeight) {