Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Button Design + Compat-layer #1240

Merged
merged 4 commits into from
Apr 24, 2024
Merged

Button Design + Compat-layer #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
999e3e3
add size + variants props
aaazzam Apr 24, 2024
d1f8b6b
Update Buttons.vue
aaazzam Apr 24, 2024
c9268fb
Update Buttons.vue
aaazzam Apr 24, 2024
3df2208
Update Buttons.vue
aaazzam Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 55 additions & 47 deletions demo/sections/components/Buttons.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,88 +2,100 @@
<ComponentPage
title="Button"
:demos="[
{ title: 'Default button', description: 'Your go-to button for interactions.' },
{ title: 'Primary button', description: 'For a button that progresses the current journey. Only one per screen.' },
{ title: 'Icon only', description: 'When an icon is provided with no text.' },
{ title: 'Flat icon only', description: 'While any button can technically be made flat, this style is intended to be used with icon only buttons.' },
{ title: 'Loading', description: 'A soothing loading indicator for when a button is working on it.' },
{ title: 'Selected', description: 'Indicates that a button is the active selection in a group.' },
{ title: 'Outline button' },
{ title: 'Default button' },
{ title: 'Destructive button' },
{ title: 'Ghost button' },
{ title: 'Icon only' },
{ title: 'Loading' },
{ title: 'Selected' },
]"
>
<template #description>
Buttons. The 'DON'T PANIC' signs of the internet, assuring us there's always something we're allowed to click.
</template>

<template #default-button>
<template #outline-button>
<div class="flex gap-4 items-center flex-wrap mb-4">
<p-button>
<p-button variant="outline">
Button
</p-button>
<p-button icon="PlusIcon">
<p-button variant="outline" icon="PlusIcon">
With Icon
</p-button>
<p-button icon-append="PlusIcon">
Appended Icon
<p-button variant="outline" disabled>
Disabled
</p-button>
<p-button dangerous>
Dangerous
<p-button variant="outline" size="sm">
Small
</p-button>
<p-button disabled>
</div>
</template>

<template #default-button>
<div class="flex gap-4 items-center flex-wrap">
<p-button variant="default">
Button
</p-button>
<p-button variant="default" icon="PlusIcon">
With Icon
</p-button>
<p-button disabled variant="default">
Disabled
</p-button>
<p-button variant="default" size="sm">
Small
</p-button>
</div>
</template>

<template #ghost-button>
<div class="flex gap-4 items-center flex-wrap">
<p-button small>
<p-button variant="ghost">
Button
</p-button>
<p-button small icon="PlusIcon">
<p-button variant="ghost" icon="PlusIcon">
With Icon
</p-button>
<p-button small icon-append="PlusIcon">
Appended Icon
<p-button variant="ghost" disabled>
Disabled
</p-button>
<p-button variant="ghost" size="sm">
Small
</p-button>
</div>
</template>

<template #primary-button>
<template #destructive-button>
<div class="flex gap-4 items-center flex-wrap">
<p-button primary>
<p-button variant="destructive">
Button
</p-button>
<p-button primary icon="PlusIcon">
<p-button variant="destructive" icon="PlusIcon">
With Icon
</p-button>
<p-button disabled primary>
<p-button variant="destructive" disabled>
Disabled
</p-button>
<p-button dangerous primary>
Dangerous
</p-button>
<p-button primary small>
<p-button variant="destructive" size="sm">
Small
</p-button>
</div>
</template>

<template #icon-only>
<div class="flex gap-4 items-center flex-wrap mb-4">
<p-button icon="PlusIcon" />
<p-button icon="RocketLaunchIcon" primary />
<p-button icon="TrashIcon" dangerous />
<p-button icon="RocketLaunchIcon" variant="default" />
<p-button icon="TrashIcon" variant="destructive" />
</div>
<div class="flex gap-4 items-center flex-wrap">
<p-button small icon="PlusIcon" />
<p-button small icon="RocketLaunchIcon" primary />
<p-button small icon="TrashIcon" dangerous />
<p-button size="sm" icon="PlusIcon" />
<p-button size="sm" icon="RocketLaunchIcon" variant="default" />
<p-button size="sm" icon="TrashIcon" variant="destructive" />
</div>
</template>

<template #flat-icon-only>
<div class="flex gap-4 items-center flex-wrap">
<p-button icon="PlusIcon" flat />
<p-button icon="TrashIcon" flat dangerous />
<p-button icon="PlusIcon" flat small />
<p-button icon="PlusIcon" flat disabled />
<p-button icon="PlusIcon" variant="ghost" />
<p-button icon="PlusIcon" variant="ghost" size="sm" />
<p-button icon="PlusIcon" variant="ghost" disabled />
</div>
</template>

Expand All @@ -92,18 +104,14 @@
<p-button :loading="buttonLoading">
Button
</p-button>
<p-button :loading="buttonLoading" primary>
Button
</p-button>
<p-button :loading="buttonLoading" dangerous>
<p-button :loading="buttonLoading" variant="default">
Button
</p-button>
<p-button :loading="buttonLoading" primary dangerous>
<p-button :loading="buttonLoading" variant="destructive">
Button
</p-button>
<p-button :loading="buttonLoading" icon="PlusIcon" />
<p-button :loading="buttonLoading" icon="PlusIcon" flat />
<p-button :loading="buttonLoading" icon="PlusIcon" flat dangerous />
<p-button :loading="buttonLoading" icon="PlusIcon" variant="ghost" />
</div>

<p-checkbox v-model="buttonLoading" label="show loading" />
Expand Down
40 changes: 21 additions & 19 deletions src/components/Button/PButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import { isRouteExternal } from '@/utilities/router'

const props = defineProps<{
variant?: 'default' | 'secondary' | 'destructive' | 'outline' | 'ghost' | 'link',
size?: 'default' | 'sm' | 'lg' | 'icon',
primary?: boolean,
flat?: boolean,
selected?: boolean,
Expand Down Expand Up @@ -80,10 +82,10 @@

const classes = computed(() => ({
'p-button--icon-only': props.icon && !slots.default,
'p-button--primary': props.primary,
'p-button--danger': props.dangerous,
'p-button--flat': props.flat,
'p-button--small': props.small,
'p-button--default': props.primary || props.variant === 'default' || props.variant === 'destructive',
'p-button--destructive': props.dangerous || props.variant === 'destructive',
'p-button--ghost': props.flat || props.variant === 'ghost',
'p-button--small': props.small || props.size === 'sm',
'p-button--icon-prepend': props.icon && slots.default,
'p-button--icon-append': props.iconAppend && slots.default,
'p-button--disabled': props.disabled || props.loading,
Expand Down Expand Up @@ -151,81 +153,81 @@
font-normal
}

.p-button--primary {
.p-button--default {
background-color: var(--p-color-button-primary-bg);
border-color: var(--p-color-button-primary-border);
color: var(--p-color-button-primary-text);
}
.p-button--primary:not(:disabled):hover {
.p-button--default:not(:disabled):hover {
background-color: var(--p-color-button-primary-bg-hover);
border-color: var(--p-color-button-primary-border-hover);
color: var(--p-color-button-primary-text-hover);
}
.p-button--primary:not(:disabled):active {
.p-button--default:not(:disabled):active {
background-color: var(--p-color-button-primary-bg-active);
border-color: var(--p-color-button-primary-border-active);
color: var(--p-color-button-primary-text-active);
}

.p-button--danger {
.p-button--destructive {
background-color: var(--p-color-button-danger-bg);
border-color: var(--p-color-button-danger-border);
color: var(--p-color-button-danger-text);
}
.p-button--danger:not(:disabled):hover {
.p-button--destructive:not(:disabled):hover {
background-color: var(--p-color-button-danger-bg-hover);
border-color: var(--p-color-button-danger-border-hover);
color: var(--p-color-button-danger-text-hover);
}
.p-button--danger:not(:disabled):active {
.p-button--destructive:not(:disabled):active {
background-color: var(--p-color-button-danger-bg-active);
border-color: var(--p-color-button-danger-border-active);
color: var(--p-color-button-danger-text-active);
}

.p-button--primary.p-button--danger {
.p-button--default.p-button--destructive {
background-color: var(--p-color-button-primary-danger-bg);
border-color: var(--p-color-button-primary-danger-border);
color: var(--p-color-button-primary-danger-text);
}
.p-button--primary.p-button--danger:not(:disabled):hover {
.p-button--default.p-button--destructive:not(:disabled):hover {
background-color: var(--p-color-button-primary-danger-bg-hover);
border-color: var(--p-color-button-primary-danger-border-hover);
color: var(--p-color-button-primary-danger-text-hover);
}
.p-button--primary.p-button--danger:not(:disabled):active {
.p-button--default.p-button--destructive:not(:disabled):active {
background-color: var(--p-color-button-primary-danger-bg-active);
border-color: var(--p-color-button-primary-danger-border-active);
color: var(--p-color-button-primary-danger-text-active);
}

.p-button--flat {
.p-button--ghost {
background-color: var(--p-color-button-flat-bg);
border-color: var(--p-color-button-flat-border);
color: var(--p-color-button-flat-text);
}
.p-button--flat:not(:disabled):hover {
.p-button--ghost:not(:disabled):hover {
background-color: var(--p-color-button-flat-bg-hover);
border-color: var(--p-color-button-flat-border-hover);
color: var(--p-color-button-flat-text-hover);
}
.p-button--flat:not(:disabled):active {
.p-button--ghost:not(:disabled):active {
background-color: var(--p-color-button-flat-bg-active);
border-color: var(--p-color-button-flat-border-active);
color: var(--p-color-button-flat-text-active);
}

.p-button--flat.p-button--danger {
.p-button--ghost.p-button--destructive {
background-color: var(--p-color-button-flat-danger-bg);
border-color: var(--p-color-button-flat-danger-border);
color: var(--p-color-button-flat-danger-text);
}
.p-button--flat.p-button--danger:not(:disabled):hover {
.p-button--ghost.p-button--destructive:not(:disabled):hover {
background-color: var(--p-color-button-flat-danger-bg-hover);
border-color: var(--p-color-button-flat-danger-border-hover);
color: var(--p-color-button-flat-danger-text-hover);
}
.p-button--flat.p-button--danger:not(:disabled):active {
.p-button--ghost.p-button--destructive:not(:disabled):active {
background-color: var(--p-color-button-flat-danger-bg-active);
border-color: var(--p-color-button-flat-danger-border-active);
color: var(--p-color-button-flat-danger-text-active);
Expand Down
Loading