From 444c565980329a2118cb869df36929809252c256 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Mon, 2 Oct 2023 17:57:42 +0200 Subject: [PATCH 1/9] docs: remove `New` badges --- docs/content/1.getting-started/3.theming.md | 4 ++-- docs/content/3.forms/9.form-group.md | 10 +++++----- docs/content/4.data/1.table.md | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/content/1.getting-started/3.theming.md b/docs/content/1.getting-started/3.theming.md index cc13f46c14..3a9ec6c990 100644 --- a/docs/content/1.getting-started/3.theming.md +++ b/docs/content/1.getting-started/3.theming.md @@ -93,7 +93,7 @@ export default defineAppConfig({ Thanks to [tailwind-merge](https://github.com/dcastil/tailwind-merge), the `app.config.ts` is smartly merged with the default config. This means you don't have to rewrite everything. -You can change this behaviour by setting `strategy` to `override` in your `app.config.ts`: :u-badge{label="New" class="!rounded-full" variant="subtle"} +You can change this behaviour by setting `strategy` to `override` in your `app.config.ts`: ```ts [app.config.ts] export default defineAppConfig({ @@ -146,7 +146,7 @@ To change the font of the `label`, you only need to write: This will smartly replace the `font-medium` by `font-semibold` and prevent any class duplication and any class priority issue. -You can change this behaviour by setting `strategy` to `override` inside the `ui` prop: :u-badge{label="New" class="!rounded-full" variant="subtle"} +You can change this behaviour by setting `strategy` to `override` inside the `ui` prop: ```vue - ## Slots -### `label` :u-badge{label="New" class="align-middle ml-2 !rounded-full" variant="subtle"} +### `label` Use the `#label` slot to set the custom content for label. @@ -210,7 +210,7 @@ slots: :u-input{model-value="benjamincanac" placeholder="you@example.com"} :: -### `description` :u-badge{label="New" class="align-middle ml-2 !rounded-full" variant="subtle"} +### `description` Use the `#description` slot to set the custom content for description. @@ -230,7 +230,7 @@ props: :u-input{model-value="benjamincanac" placeholder="you@example.com"} :: -### `hint` :u-badge{label="New" class="align-middle ml-2 !rounded-full" variant="subtle"} +### `hint` Use the `#hint` slot to set the custom content for hint. @@ -250,7 +250,7 @@ props: :u-input{model-value="benjamincanac" placeholder="you@example.com"} :: -### `help` :u-badge{label="New" class="align-middle ml-2 !rounded-full" variant="subtle"} +### `help` Use the `#help` slot to set the custom content for help. @@ -270,7 +270,7 @@ props: :u-input{model-value="benjamincanac" placeholder="you@example.com"} :: -### `error` :u-badge{label="New" class="align-middle ml-2 !rounded-full" variant="subtle"} +### `error` Use the `#error` slot to set the custom content for error. diff --git a/docs/content/4.data/1.table.md b/docs/content/4.data/1.table.md index aef481aca1..cb2f369d69 100644 --- a/docs/content/4.data/1.table.md +++ b/docs/content/4.data/1.table.md @@ -524,7 +524,7 @@ excludedProps: --- :: -## Styling :u-badge{label="New" class="align-middle ml-2 !rounded-full" variant="subtle"} +## Styling You can apply styles to `tr` and `td` elements by passing a `class` to rows. From d6412f9b6b5e8e0e50887d6a892025afcdbcbbab Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Tue, 3 Oct 2023 10:52:22 +0200 Subject: [PATCH 2/9] docs: bump `@nuxt/ui-pro` --- docs/package.json | 2 +- pnpm-lock.yaml | 62 +++++++++++++++++++++++------------------------ 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/package.json b/docs/package.json index 63452abd8d..5b0dbaf766 100644 --- a/docs/package.json +++ b/docs/package.json @@ -10,7 +10,7 @@ "@nuxt/content": "^2.8.5", "@nuxt/devtools": "^0.8.5", "@nuxt/eslint-config": "^0.2.0", - "@nuxt/ui-pro": "npm:@nuxt/ui-pro-edge@0.0.1-28265230.40bb224", + "@nuxt/ui-pro": "^0.1.0", "@nuxthq/studio": "^0.14.1", "@nuxtjs/fontaine": "^0.4.1", "@nuxtjs/google-fonts": "^3.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 966e06ebeb..f06ac6cfff 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -137,8 +137,8 @@ importers: specifier: ^0.2.0 version: 0.2.0(eslint@8.50.0) '@nuxt/ui-pro': - specifier: npm:@nuxt/ui-pro-edge@0.0.1-28265230.40bb224 - version: /@nuxt/ui-pro-edge@0.0.1-28265230.40bb224(rollup@3.29.1)(vue@3.3.4)(webpack@5.88.2) + specifier: ^0.1.0 + version: 0.1.0(rollup@3.29.1)(vue@3.3.4)(webpack@5.88.2) '@nuxthq/studio': specifier: ^0.14.1 version: 0.14.1(rollup@3.29.1) @@ -1594,32 +1594,14 @@ packages: - supports-color dev: true - /@nuxt/ui-edge@2.8.1-28266619.d46eafb(rollup@3.29.1)(vue@3.3.4)(webpack@5.88.2): - resolution: {integrity: sha512-WWTBpHbc2lWDlaeENvA+V4EZ9/PAdHQexAxZTdlLZZj5wJVfeEKL4S02g9A/aSwg+GngoVJKydPS3D1HJmY3lg==} - engines: {node: '>=v16.20.2'} + /@nuxt/ui-pro@0.1.0(rollup@3.29.1)(vue@3.3.4)(webpack@5.88.2): + resolution: {integrity: sha512-nioKaQ20msCyhk51Pyi1uEEFFhtkxSRZvFxeVcysKpf82TGpBfPkTRGzrWGzNiKSiGM3RpawkS48LYYdW7S+/w==} dependencies: - '@egoist/tailwindcss-icons': 1.2.0(tailwindcss@3.3.3) - '@headlessui/tailwindcss': 0.2.0(tailwindcss@3.3.3) - '@headlessui/vue': 1.7.16(vue@3.3.4) - '@iconify-json/heroicons': 1.1.12 - '@nuxt/kit': 3.7.4(rollup@3.29.1) - '@nuxtjs/color-mode': 3.3.0(rollup@3.29.1) - '@nuxtjs/tailwindcss': 6.8.0(rollup@3.29.1)(webpack@5.88.2) - '@popperjs/core': 2.11.8 - '@tailwindcss/aspect-ratio': 0.4.2(tailwindcss@3.3.3) - '@tailwindcss/container-queries': 0.1.1(tailwindcss@3.3.3) - '@tailwindcss/forms': 0.5.6(tailwindcss@3.3.3) - '@tailwindcss/typography': 0.5.10(tailwindcss@3.3.3) + '@nuxt/ui': 2.9.0(rollup@3.29.1)(vue@3.3.4)(webpack@5.88.2) '@vueuse/core': 10.4.1(vue@3.3.4) - '@vueuse/integrations': 10.4.1(fuse.js@6.6.2)(vue@3.3.4) - '@vueuse/math': 10.4.1(vue@3.3.4) - defu: 6.1.2 - fuse.js: 6.6.2 - ohash: 1.1.3 + ofetch: 1.3.3 pathe: 1.1.1 - scule: 1.0.0 tailwind-merge: 1.14.0 - tailwindcss: 3.3.3 transitivePeerDependencies: - '@vue/composition-api' - async-validator @@ -1640,14 +1622,35 @@ packages: - webpack dev: true - /@nuxt/ui-pro-edge@0.0.1-28265230.40bb224(rollup@3.29.1)(vue@3.3.4)(webpack@5.88.2): - resolution: {integrity: sha512-3fkeU9le/lnJbtVGnpeQUUYW1ezEDr1UUX7MmEQAxvZSdiORgcSKnooe7TA34I64s7YhaMcau3ss7DGSl3lMbQ==} + /@nuxt/ui-templates@1.3.1: + resolution: {integrity: sha512-5gc02Pu1HycOVUWJ8aYsWeeXcSTPe8iX8+KIrhyEtEoOSkY0eMBuo0ssljB8wALuEmepv31DlYe5gpiRwkjESA==} + + /@nuxt/ui@2.9.0(rollup@3.29.1)(vue@3.3.4)(webpack@5.88.2): + resolution: {integrity: sha512-e7Xo7xq9C71zdkLFO/IRMAxsX0ms3wMWxQq2kKUuh/ZiLD7/NjxeDle/XAwEAfzn5vdXCkygIK3w0R5UO9I5Pg==} + engines: {node: '>=v16.20.2'} dependencies: - '@nuxt/ui': /@nuxt/ui-edge@2.8.1-28266619.d46eafb(rollup@3.29.1)(vue@3.3.4)(webpack@5.88.2) + '@egoist/tailwindcss-icons': 1.2.0(tailwindcss@3.3.3) + '@headlessui/tailwindcss': 0.2.0(tailwindcss@3.3.3) + '@headlessui/vue': 1.7.16(vue@3.3.4) + '@iconify-json/heroicons': 1.1.12 + '@nuxt/kit': 3.7.4(rollup@3.29.1) + '@nuxtjs/color-mode': 3.3.0(rollup@3.29.1) + '@nuxtjs/tailwindcss': 6.8.0(rollup@3.29.1)(webpack@5.88.2) + '@popperjs/core': 2.11.8 + '@tailwindcss/aspect-ratio': 0.4.2(tailwindcss@3.3.3) + '@tailwindcss/container-queries': 0.1.1(tailwindcss@3.3.3) + '@tailwindcss/forms': 0.5.6(tailwindcss@3.3.3) + '@tailwindcss/typography': 0.5.10(tailwindcss@3.3.3) '@vueuse/core': 10.4.1(vue@3.3.4) - ofetch: 1.3.3 + '@vueuse/integrations': 10.4.1(fuse.js@6.6.2)(vue@3.3.4) + '@vueuse/math': 10.4.1(vue@3.3.4) + defu: 6.1.2 + fuse.js: 6.6.2 + ohash: 1.1.3 pathe: 1.1.1 + scule: 1.0.0 tailwind-merge: 1.14.0 + tailwindcss: 3.3.3 transitivePeerDependencies: - '@vue/composition-api' - async-validator @@ -1668,9 +1671,6 @@ packages: - webpack dev: true - /@nuxt/ui-templates@1.3.1: - resolution: {integrity: sha512-5gc02Pu1HycOVUWJ8aYsWeeXcSTPe8iX8+KIrhyEtEoOSkY0eMBuo0ssljB8wALuEmepv31DlYe5gpiRwkjESA==} - /@nuxt/vite-builder@3.7.4(eslint@8.50.0)(rollup@3.29.1)(typescript@5.2.2)(vue-tsc@1.8.15)(vue@3.3.4): resolution: {integrity: sha512-EWZlUzYvkSfIZPA0pQoi7P++68Mlvf5s/G3GBPksS5JB/9l3yZTX+ZqGvLeORSBmoEpJ6E2oMn2WvCHV0W5y6Q==} engines: {node: ^14.18.0 || >=16.10.0} From c3e51b6b68cdbb8206640dd03e558563c673ec37 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Tue, 3 Oct 2023 14:54:58 +0200 Subject: [PATCH 3/9] docs(popover): add `panel` slot example Resolves #763 --- .../content/examples/PopoverExampleSlot.vue | 11 +++++++++ docs/content/6.overlays/3.popover.md | 23 ++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 docs/components/content/examples/PopoverExampleSlot.vue diff --git a/docs/components/content/examples/PopoverExampleSlot.vue b/docs/components/content/examples/PopoverExampleSlot.vue new file mode 100644 index 0000000000..0737b6e98a --- /dev/null +++ b/docs/components/content/examples/PopoverExampleSlot.vue @@ -0,0 +1,11 @@ + diff --git a/docs/content/6.overlays/3.popover.md b/docs/content/6.overlays/3.popover.md index 7e65d03e0e..07338a3e31 100644 --- a/docs/content/6.overlays/3.popover.md +++ b/docs/content/6.overlays/3.popover.md @@ -14,6 +14,7 @@ links: ::component-example #default :popover-example + #code ```vue