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.

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

[#1923] New buttons design implementation #1945

Merged
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
d85fded
wip
aluarius Jun 12, 2022
9d069dd
[wip] [#1923] va button redesign
aluarius Jun 14, 2022
e3c2c63
Merge branch 'develop' into feat/1923-new-buttons-implementation
aluarius Jun 15, 2022
830643e
updates
aluarius Jun 15, 2022
7b303d4
updates
aluarius Jun 15, 2022
b25c210
updates
aluarius Jun 16, 2022
1511998
updates
aluarius Jun 17, 2022
6968b89
updates
aluarius Jun 20, 2022
ab05a3e
updates
aluarius Jun 21, 2022
6a75ec8
Merge branch 'release/1.5.0' into feat/1923-new-buttons-implementation
aluarius Jun 22, 2022
750cd93
presets added, bugfixing
aluarius Jun 22, 2022
cc26da7
Merge branch 'release/1.5.0' into feat/1923-new-buttons-implementation
aluarius Jul 1, 2022
eb9ddf5
docs & related to va button component updates
aluarius Jul 1, 2022
85b4728
fix: new button implementation no-label state problem, deleted redund…
aluarius Jul 2, 2022
7f706b1
fix: new button implementation no-label state problem, deleted redund…
aluarius Jul 2, 2022
fb80f00
fix: minor bugfixing
aluarius Jul 2, 2022
2f06e80
fix: va-dropdown only-icon state fix
aluarius Jul 4, 2022
d65ad4f
fix: va-button-dropdown preset-props conflict fix
aluarius Jul 4, 2022
3594c9f
fix: landing header spacing fix
aluarius Jul 4, 2022
c203fcb
fix: minor va-button-dropdown demo fix
aluarius Jul 4, 2022
5392385
fix:additional preset-props conflict in va-button-dropdown fix
aluarius Jul 4, 2022
b928e0f
fix:redundant va-button props deleted from va-button-dropdown
aluarius Jul 4, 2022
d6d0085
feat:related to the va-button docs updates
aluarius Jul 4, 2022
4770b3c
feat:related to the va-button docs updates
aluarius Jul 4, 2022
9d4d57f
fix:docs/landing header buttons fix
aluarius Jul 4, 2022
71274db
feat:related to va-button docs updates
aluarius Jul 4, 2022
ab9fd32
fix:redundant va-button props deleted from va-button-group
aluarius Jul 4, 2022
19d1081
fix:header language dropdown style fix
aluarius Jul 4, 2022
e6742d0
fix:redundant va-button props deleted from va-button-toggle
aluarius Jul 4, 2022
7d9d552
feat:related to va-button docs updates
aluarius Jul 4, 2022
7d4cfed
Merge remote-tracking branch 'upstream/release/1.5.0' into feat/1923-…
aluarius Jul 5, 2022
dfac692
fix:updates after devel branch is merged
aluarius Jul 5, 2022
27d3489
Merge remote-tracking branch 'upstream/release/1.5.0' into feat/1923-…
aluarius Jul 10, 2022
0dddbf8
Merge branch 'release/1.5.0' into feat/1923-new-buttons-implementation
aluarius Jul 26, 2022
f1d7670
Merge remote-tracking branch 'upstream/release/1.5.0' into feat/1923-…
aluarius Aug 11, 2022
f3c6b5d
refactor: review suggestions
aluarius Aug 11, 2022
bd2d8f0
Merge branch 'release/1.5.0' into feat/1923-new-buttons-implementation
aluarius Aug 11, 2022
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
3 changes: 1 addition & 2 deletions packages/docs/src/components/DocsExample.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<va-button
v-if="!exampleOptions.forceShowCode"
class="mt-2 d-block docs-example__show-code-button"
flat
preset="plain"
size="small"
color="primary"
@click="showCode = !showCode"
>
{{ showCode ? $t('docsExample.hideCode') : $t('docsExample.showCode') }}
Expand Down
6 changes: 3 additions & 3 deletions packages/docs/src/components/DocsNavigation.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="docs-navigation">
<va-button
flat
preset="plain"
size="small"
class="docs-navigation__button"
color="gray"
Expand All @@ -12,7 +12,7 @@
</va-button>

<va-button
flat
preset="plain"
size="small"
class="docs-navigation__button"
color="gray"
Expand All @@ -26,7 +26,7 @@
<form :action="sandboxDefineUrl" method="POST" target="_blank">
<input type="hidden" name="parameters" :value="sandboxParams" />
<va-button
flat
preset="plain"
type="submit"
size="small"
class="docs-navigation__button"
Expand Down
3 changes: 1 addition & 2 deletions packages/docs/src/components/header/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
<va-button
v-for="(link, index) in links"
:key="index"
flat
preset="secondary"
class="header__links__button ml-2"
color="primary"
:to="link.to"
:href="link.url"
:target="link.target"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<div class="color-dropdown">
<va-button-dropdown
class="color-dropdown__icon"
color="primary"
flat
preset="plain"
label="Colors"
:offset="[0, 25]"
>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<template>
<div class="language-dropdown">
<va-button-dropdown
color="primary"
flat
preset="secondary"
:label="currentLanguageName"
:offset="[0, 10]"
>
Expand Down
7 changes: 2 additions & 5 deletions packages/docs/src/components/landing/Admin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,15 @@
<va-button class="admin__buttons--button"
href="https://github.com/epicmaxco/vuestic-admin"
target="blank"
:rounded="false"
color="primary"
preset="plain"
>
<va-icon class="fa fa-github" style="margin-right: 0.5rem;" />
{{ $t('landing.admin.buttons.github') }}
</va-button>
<va-button class="admin__buttons--button"
href="https://vuestic.epicmax.co/admin/dashboard"
target="blank"
:rounded="false"
color="primary"
flat
preset="plain"
>
{{ $t('landing.admin.buttons.demo') }}
</va-button>
Expand Down
6 changes: 3 additions & 3 deletions packages/docs/src/components/landing/ColorTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<va-button-toggle
class="pb-2"
v-model="selectedTheme"
outline
small
color="primary"
border-color="primary"
preset="secondary"
size="small"
:options="themeOptions"
style="max-width: 100%;"
/>
Expand Down
3 changes: 1 addition & 2 deletions packages/docs/src/components/landing/Customize.vue
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,6 @@ export default class Customize extends Vue {
<div class="component">
<va-button-toggle
v-model="theme"
color="primary"
:options="themeToggleOptions"
@input="updateTheme"
/>
Expand All @@ -367,7 +366,7 @@ export default class Customize extends Vue {
</div>

<div class="component">
<va-button color="primary">
<va-button>
Submit
</va-button>
</div>
Expand Down
24 changes: 7 additions & 17 deletions packages/docs/src/components/landing/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
class="footer__buttons__button"
href="https://epicmax.co/about"
target="blank"
:rounded="false"
color="primary"
flat
preset="plain"
>
<va-icon class="button-icon" :component="IconEpicmax" />
{{ $t("landing.footer.buttons.epicmax") }}
Expand All @@ -18,9 +16,7 @@
class="footer__buttons__button"
href="https://github.com/epicmaxco/vuestic-admin"
target="blank"
:rounded="false"
color="primary"
flat
preset="plain"
>
<va-icon class="button-icon" :component="IconAdmin" />
{{ $t("landing.footer.buttons.admin") }}
Expand All @@ -29,9 +25,7 @@
class="footer__buttons__button"
href="https://github.com/epicmaxco/epic-spinners"
target="blank"
:rounded="false"
color="primary"
flat
preset="plain"
>
<va-icon class="button-icon" :component="IconSpinners" />
{{ $t("landing.footer.buttons.spinners") }}
Expand All @@ -42,35 +36,31 @@
class="footer__social__item"
href="https://github.com/epicmaxco/vuestic-ui/"
target="blank"
color="primary"
flat
preset="plain"
>
<va-icon class="mdi mdi-github" />
</va-button>
<va-button
class="footer__social__item"
href="https://discord.gg/u7fQdqQt8c"
target="blank"
color="primary"
flat
preset="plain"
>
<va-icon class="mdi mdi-discord" />
</va-button>
<va-button
class="footer__social__item"
href="https://www.facebook.com/epicmaxco/"
target="blank"
color="primary"
flat
preset="plain"
>
<va-icon class="mdi mdi-facebook" />
</va-button>
<va-button
class="footer__social__item"
href="https://twitter.com/epicmaxco"
target="blank"
color="primary"
flat
preset="plain"
>
<va-icon class="mdi mdi-twitter" />
</va-button>
Expand Down
8 changes: 4 additions & 4 deletions packages/docs/src/components/landing/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
</div>
<nav class="header__links">
<!-- vuestic buttons -->
<va-button :to="`/${$root.$i18n.locale}/introduction/overview`" class="header__links--link" flat color="primary">{{ $t('landing.header.buttons.overview') }}</va-button>
<va-button :to="`/${$root.$i18n.locale}/introduction/overview`" class="header__links--link" flat color="primary">{{ $t('landing.header.buttons.docs') }}</va-button>
<va-button href="https://discord.gg/u7fQdqQt8c" target="blank" class="header__links--link" flat color="primary">{{ $t('landing.header.buttons.discord') }}</va-button>
<LanguageDropdown />
<va-button :to="`/${$root.$i18n.locale}/introduction/overview`" class="header__links--link" preset="secondary">{{ $t('landing.header.buttons.overview') }}</va-button>
<va-button :to="`/${$root.$i18n.locale}/introduction/overview`" class="header__links--link" preset="secondary">{{ $t('landing.header.buttons.docs') }}</va-button>
<va-button href="https://discord.gg/u7fQdqQt8c" target="blank" class="header__links--link" preset="secondary">{{ $t('landing.header.buttons.discord') }}</va-button>
<language-dropdown class="ml-2" />
<stars-button class="ml-2" repo="epicmaxco/vuestic-ui" />
</nav>
<!-- mobile -->
Expand Down
6 changes: 1 addition & 5 deletions packages/docs/src/components/landing/Preview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<div class="preview__buttons">
<va-button class="preview__buttons--button"
:to="`/${$root.$i18n.locale}/getting-started/installation`"
:rounded="false"
color="primary"
>
{{$t('landing.preview.buttons.start')}}
</va-button>
Expand All @@ -19,9 +17,7 @@
>
<va-button href="https://github.com/epicmaxco/vuestic-ui"
target="_blank"
:rounded="false"
color="primary"
flat
preset="plain"
>
<va-icon class="fa fa-github" style="margin-right: 0.5rem;" />
{{$t('landing.preview.buttons.github')}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="block__components">

<div class="component">
<va-button color="primary">Пампуй</va-button>
<va-button>Пампуй</va-button>
</div>

<div class="component">
Expand Down
1 change: 0 additions & 1 deletion packages/docs/src/components/landing/StarsButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
class="star-button"
target="blank"
:href="url"
:rounded="false"
color="dark"
size="small"
>
Expand Down
Loading