Skip to content

Commit

Permalink
Merge branch 'dev' into add-size-prop-to-formgroup
Browse files Browse the repository at this point in the history
  • Loading branch information
henrycunh authored Jul 20, 2023
2 parents bc75909 + 4f4a659 commit 7d593a4
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 44 deletions.
10 changes: 5 additions & 5 deletions docs/content/1.getting-started/2.installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ description: 'Learn how to install and configure the module in your Nuxt app.'

::code-group

```sh [pnpm]
pnpm i -D @nuxthq/ui
```

```bash [yarn]
yarn add -D @nuxthq/ui
```
Expand All @@ -16,10 +20,6 @@ yarn add -D @nuxthq/ui
npm install -D @nuxthq/ui
```

```sh [pnpm]
pnpm i -D @nuxthq/ui
```

::

2. Add it to your `modules` section in your `nuxt.config`:
Expand Down Expand Up @@ -131,4 +131,4 @@ Update your `package.json` to the following:
}
```

Then run `npm install` or `yarn install`.
Then run `pnpm install`, `yarn install` or `npm install`.
2 changes: 1 addition & 1 deletion src/runtime/components/data/Table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default defineComponent({
default: () => ({})
},
sortButton: {
type: Object as PropType<Partial<Button>>,
type: Object as PropType<Button>,
default: () => appConfig.ui.table.default.sortButton
},
sortAscIcon: {
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/components/navigation/CommandPalette.vue
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export default defineComponent({
default: () => appConfig.ui.commandPalette.default.selectedIcon
},
closeButton: {
type: Object as PropType<Partial<Button>>,
type: Object as PropType<Button>,
default: () => appConfig.ui.commandPalette.default.closeButton
},
emptyState: {
Expand Down
8 changes: 4 additions & 4 deletions src/runtime/components/navigation/Pagination.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,19 @@ export default defineComponent({
}
},
activeButton: {
type: Object as PropType<Partial<Button>>,
type: Object as PropType<Button>,
default: () => appConfig.ui.pagination.default.activeButton
},
inactiveButton: {
type: Object as PropType<Partial<Button>>,
type: Object as PropType<Button>,
default: () => appConfig.ui.pagination.default.inactiveButton
},
prevButton: {
type: Object as PropType<Partial<Button>>,
type: Object as PropType<Button>,
default: () => appConfig.ui.pagination.default.prevButton
},
nextButton: {
type: Object as PropType<Partial<Button>>,
type: Object as PropType<Button>,
default: () => appConfig.ui.pagination.default.nextButton
},
divider: {
Expand Down
4 changes: 2 additions & 2 deletions src/runtime/components/overlays/Notification.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ export default defineComponent({
default: () => appConfig.ui.notification.default.icon
},
avatar: {
type: Object as PropType<Partial<Avatar>>,
type: Object as PropType<Avatar>,
default: null
},
closeButton: {
type: Object as PropType<Partial<Button>>,
type: Object as PropType<Button>,
default: () => appConfig.ui.notification.default.closeButton
},
timeout: {
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/types/accordion.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Button } from './button'

export interface AccordionItem extends Partial<Button> {
export interface AccordionItem extends Button {
slot?: string
disabled?: boolean
content?: string
Expand Down
14 changes: 7 additions & 7 deletions src/runtime/types/avatar.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export interface Avatar {
src: string | boolean
alt: string
text: string
size: string
chipColor: string
chipVariant: string
chipPosition: string
src?: string | boolean
alt?: string
text:? string
size?: string
chipColor?: string
chipVariant?: string
chipPosition?: string
}
32 changes: 16 additions & 16 deletions src/runtime/types/button.d.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
export interface Button {
type: string
block: boolean
label: string
loading: boolean
disabled: boolean
size: string
color: string
variant: string
icon: string
leadingIcon: string
trailingIcon: string
trailing: boolean
to: string | object
target: string
square: boolean
truncate: boolean
type?: string
block?: boolean
label?: string
loading?: boolean
disabled?: boolean
size?: string
color?: string
variant?: string
icon?: string
leadingIcon?: string
trailingIcon?: string
trailing?: boolean
to?: string | object
target?: string
square?: boolean
truncate?: boolean
}
2 changes: 1 addition & 1 deletion src/runtime/types/command-palette.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface Command {
suffix?: string
icon?: string
iconClass?: string
avatar?: Partial<Avatar>
avatar?: Avatar
chip?: string
disabled?: boolean
shortcuts?: string[]
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/types/dropdown.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export interface DropdownItem extends NuxtLinkProps {
slot?: string
icon?: string
iconClass?: string
avatar?: Partial<Avatar>
avatar?: Avatar
shortcuts?: string[]
disabled?: boolean
click?: Function
Expand Down
8 changes: 4 additions & 4 deletions src/runtime/types/notification.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import type { Avatar } from './avatar'
import type { Button } from './button'
import appConfig from '#build/app.config'

export interface NotificationAction extends Partial<Button> {
export interface NotificationAction extends Button {
click?: Function
}

export interface Notification {
id: string
title: string
description: string
description?: string
icon?: string
avatar?: Partial<Avatar>
closeButton?: Partial<Button>
avatar?: Avatar
closeButton?: Button
timeout: number
actions?: NotificationAction[]
click?: Function
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/types/vertical-navigation.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export interface VerticalNavigationLink extends NuxtLinkProps {
label: string
icon?: string
iconClass?: string
avatar?: Partial<Avatar>
avatar?: Avatar
click?: Function
badge?: string | number
}

0 comments on commit 7d593a4

Please sign in to comment.