Skip to content

Commit

Permalink
chore: lint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
manuelodelain committed May 10, 2024
1 parent 6e33148 commit 35e2af9
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 14 deletions.
5 changes: 5 additions & 0 deletions assets/scss/_common.scss
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
:root {
--size: 375;

@include media('>=md') {
--size: #{breakpoint(md, $strip-unit: true)};
}

@include media('>=lg') {
--size: #{breakpoint(lg, $strip-unit: true)};
}

@include media('>=vl') {
--size: #{breakpoint(vl, $strip-unit: true)};
}

@include media('>=xl') {
--size: #{breakpoint(xl, $strip-unit: true)};
}
}

html {
--vw-ratio: 0.3;

font-size: calc((100vw / var(--size)) * (16 * var(--vw-ratio)) + 1rem * calc(1 - var(--vw-ratio)));
}

Expand Down
1 change: 1 addition & 0 deletions assets/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// @import "vendors/orejime";
// @import "vendors/tarteaucitron";
@import "plyr/src/sass/plyr";

// functions
@import "functions";

Expand Down
2 changes: 1 addition & 1 deletion assets/scss/mixins/_component-vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@each $key, $value in $default {
#{$key}: var(#{list-implode(('--', $base, $prefix, $key), '-')}, $value);
}
} @else if(map-has-key($vars, 'default')) {
} @else if map-has-key($vars, 'default') {
$default: map-get($vars, 'default');

@each $key, $value in $default {
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/variables/_v-button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ $v-button-outlined: (
default: (
border-width: 2px,
border-style: solid,
border-color: currentColor
border-color: currentcolor
),
);

Expand Down
30 changes: 18 additions & 12 deletions components/molecules/VButton/VButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,21 @@ export default defineComponent({

<style lang="scss" module>
@if global-variable-exists('themes') {
$themes: map-merge($themes, (
dark: (
v-button-disabled-color: #757575,
v-button-disabled-foreground: #757575,
v-button-disabled-background: #E3E3E3,
),
light: (
v-button-disabled-foreground: #9F9F9F,
v-button-disabled-background: #E3E3E3,
v-button-disabled-outlined: #9F9F9F,
$themes: map-merge(
$themes,
(
dark: (
v-button-disabled-color: #757575,
v-button-disabled-foreground: #757575,
v-button-disabled-background: #e3e3e3,
),
light: (
v-button-disabled-foreground: #9f9f9f,
v-button-disabled-background: #e3e3e3,
v-button-disabled-outlined: #9f9f9f,
),
)
));
);
}
.root {
Expand All @@ -121,7 +124,9 @@ export default defineComponent({
backface-visibility: hidden;
color: var(--v-button-color, var(--theme-foreground-color));
text-transform: var(--v-button-text-transform, none);
transition: background-color 0.3s, color 0.3s;
transition:
background-color 0.3s,
color 0.3s;
&--icon-last {
flex-direction: row-reverse;
Expand All @@ -148,6 +153,7 @@ export default defineComponent({
&[inert],
&--disabled {
color: var(--v-button-disabled-color, var(--theme-v-button-disabled-foreground));
// prevents click on disabled link (<a> or <nuxt-link>)
pointer-events: none;
}
Expand Down

0 comments on commit 35e2af9

Please sign in to comment.