Skip to content

Commit 51136f8

Browse files
committed
feat: use unocss wind4 preset
1 parent 7025916 commit 51136f8

File tree

9 files changed

+20
-25
lines changed

9 files changed

+20
-25
lines changed

app/layouts/default.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<main class="flex flex-col min-h-svh">
33
<AppHeader class="h-[var(--van-nav-bar-height)]" />
44

5-
<div class="flex-1 p-16 pb-[var(--van-nav-bar-height)]">
5+
<div class="p-16 pb-[var(--van-nav-bar-height)] flex-1">
66
<slot />
77
</div>
88

app/pages/counter/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function add() {
1919
Hello, Pinia!
2020
</h1>
2121

22-
<p class="mt-10 text-gray-700 dark:text-white">
22+
<p class="text-gray-700 mt-10 dark:text-white">
2323
{{ $t('counter_page.label') }}
2424
</p>
2525

app/pages/profile/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ definePageMeta({
77
</script>
88

99
<template>
10-
<div mx-auto mb-60 pt-15 text-center text-16 text-dark dark:text-white>
10+
<div text-16 text-dark mx-auto mb-60 pt-15 text-center dark:text-white>
1111
{{ $t('profile_page.txt') }}
1212
</div>
1313
</template>

app/pages/prose/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function clear() {
2020

2121
<template>
2222
<div>
23-
<div class="h-300 flex items-center justify-center rounded-15 bg-white p-16 dark:bg-[--van-background-2]">
23+
<div class="p-16 rounded-15 bg-white flex h-300 items-center justify-center dark:bg-[--van-background-2]">
2424
<div v-if="proseStore.prose" class="text-16 leading-26">
2525
{{ proseStore.prose }}
2626
</div>

app/pages/unocss/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ definePageMeta({
1111
{{ $t('unocss_page.hello', ['Unocss!']) }}
1212
</h1>
1313

14-
<p class="mt-10 text-gray-700 dark:text-white">
14+
<p class="text-gray-700 mt-10 dark:text-white">
1515
{{ $t('unocss_page.desc') }}
1616
</p>
1717

nuxt.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export default defineNuxtConfig({
2121
},
2222

2323
css: [
24-
'@unocss/reset/tailwind.css',
2524
'./app/styles/vars.css',
2625
'./app/styles/global.css',
2726
'./app/styles/default-theme.css',

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"@pinia/nuxt": "^0.11.0",
3333
"@unocss/eslint-plugin": "66.1.0-beta.11",
3434
"@unocss/nuxt": "66.1.0-beta.11",
35-
"@unocss/preset-rem-to-px": "66.1.0-beta.11",
3635
"@vant/nuxt": "^1.0.6",
3736
"bumpp": "^10.1.0",
3837
"eslint": "^9.24.0",

pnpm-lock.yaml

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

uno.config.ts

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,38 @@
1-
import presetRemToPx from '@unocss/preset-rem-to-px'
2-
import presetWind3 from '@unocss/preset-wind3'
1+
import { createRemToPxResolver } from '@unocss/preset-wind4/utils'
32

43
import {
54
defineConfig,
65
presetAttributify,
76
presetIcons,
87
presetTypography,
98
presetWebFonts,
9+
presetWind4,
1010
transformerDirectives,
1111
transformerVariantGroup,
1212
} from 'unocss'
1313

14-
// https://unocss.dev/guide/config-file
14+
/**
15+
* The base font size to convert rem to px (1rem = n px).
16+
*/
17+
const BASE_FONT_SIZE = 4
18+
1519
export default defineConfig({
1620
shortcuts: [
17-
// shortcuts to multiple utilities
1821
['btn', 'px-6 py-3 rounded-3 inline-block bg-primary text-white cursor-pointer hover:bg-primary-hover disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50'],
1922
],
2023

2124
presets: [
22-
presetWind3(),
25+
presetWind4({
26+
/**
27+
* Converts rem to px for all utilities
28+
*/
29+
utilityResolver: createRemToPxResolver(BASE_FONT_SIZE),
30+
}),
2331
presetAttributify(),
2432
presetIcons(),
2533
presetTypography(),
26-
presetWebFonts(),
27-
presetRemToPx({
28-
baseFontSize: 4,
34+
presetWebFonts({
35+
themeKey: 'font',
2936
}),
3037
],
3138

0 commit comments

Comments
 (0)