Skip to content

Commit

Permalink
Merge pull request #2585 from nextcloud/feature/noid/tertiary-buttons…
Browse files Browse the repository at this point in the history
…-default-hover-feedback

Add tertiary buttons with background and make them the default
  • Loading branch information
marcoambrosini committed Mar 31, 2022
2 parents 170e2be + f67de01 commit 525f6aa
Showing 1 changed file with 38 additions and 4 deletions.
42 changes: 38 additions & 4 deletions src/components/Button/Button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,17 @@ It can be used with one or multiple actions.
<!-- Icon only -->
<h5>Icon only buttons</h5>
<div class="grid">
<p>Tertiary, no background</p>
<p>Tertiary</p>
<p>Secondary</p>
<p>Primary</p>
<Button
type="tertiary-no-background">
<template #icon>
<Video
:size="20" />
</template>
</Button>
<Button
type="tertiary">
<template #icon>
Expand All @@ -65,9 +73,14 @@ It can be used with one or multiple actions.
<!-- Text only -->
<h5>Text only buttons</h5>
<div class="grid">
<p>Tertiary, no background</p>
<p>Tertiary</p>
<p>Secondary</p>
<p>Primary</p>
<Button
type="tertiary-no-background">
Example text
</Button>
<Button
type="tertiary">
Example text
Expand All @@ -84,9 +97,18 @@ It can be used with one or multiple actions.
<!-- Icon and text -->
<h5>Icon and text buttons</h5>
<div class="grid">
<p>Tertiary, no background</p>
<p>Tertiary</p>
<p>Secondary</p>
<p>Primary</p>
<Button
type="tertiary-no-background">
<template #icon>
<Video
:size="20" />
</template>
Example text
</Button>
<Button
type="tertiary">
<template #icon>
Expand Down Expand Up @@ -132,6 +154,7 @@ It can be used with one or multiple actions.
<p>Success</p>
<p>Warning</p>
<p>Error</p>
<p> - </p>
<Button
type="success">
<template #icon>
Expand All @@ -157,6 +180,7 @@ It can be used with one or multiple actions.
</template>
Example text
</Button>
<p> - </p>
</div>
</div>

Expand All @@ -183,7 +207,7 @@ export default {
.grid {
display: grid;
grid-template-columns: 1fr 1fr 1fr;
grid-template-columns: 1fr 1fr 1fr 1fr;
grid-template-rows: repeat(auto-fill, auto);
position: relative;
margin: 12px 0;
Expand Down Expand Up @@ -256,7 +280,7 @@ export default {
type: {
type: String,
validator(value) {
return ['primary', 'secondary', 'tertiary', 'error', 'warning', 'success'].indexOf(value) !== -1
return ['primary', 'secondary', 'tertiary', 'tertiary-no-background', 'error', 'warning', 'success'].indexOf(value) !== -1
},
default: 'secondary',
},
Expand Down Expand Up @@ -516,8 +540,8 @@ export default {
&.button-vue--vue-secondary {
box-shadow: 0 0 0 2px var(--color-main-text);
}
&.button-vue--vue-tertiary {
color: var(--color-main-text);
&.button-vue--vue-tertiary-no-background {
opacity: 1;
}
&.button-vue--vue-success {
background-color: var(--color-success-hover);
Expand Down Expand Up @@ -562,6 +586,16 @@ export default {
&--vue-tertiary {
color: var(--color-main-text);
background-color: transparent;
&:hover {
background-color: var(--color);
background-color: var(--color-background-hover);
}
}
// Tertiary, no background
&--vue-tertiary-no-background {
color: var(--color-text-lighter);
background-color: transparent;
opacity: .7;
&:hover {
background-color: transparent;
Expand Down

0 comments on commit 525f6aa

Please sign in to comment.