Resolved merge conflict.

This commit is contained in:
2020-02-21 22:52:36 +01:00
3 changed files with 19 additions and 29 deletions

View File

@@ -9,7 +9,9 @@
export default {
name: 'seasonedButton',
props: {
active: Boolean
required: false,
active: Boolean,
default: false
},
methods: {
emit() {
@@ -46,9 +48,16 @@ export default {
padding: 6px 20px 5px 20px;
}
body:not(.touch) &:hover, &:focus, &:active, &.active {
&:focus, &:active, &.active {
background: $text-color;
color: $background-color;
}
@media (hover: hover) {
&:hover {
background: $text-color;
color: $background-color;
}
}
}
</style>