From 35e2af93e615d9232e330510d1666a3de80a5266 Mon Sep 17 00:00:00 2001 From: Manuel Odelain Date: Fri, 10 May 2024 11:21:10 +0200 Subject: [PATCH] chore: lint fix --- assets/scss/_common.scss | 5 ++++ assets/scss/main.scss | 1 + assets/scss/mixins/_component-vars.scss | 2 +- assets/scss/variables/_v-button.scss | 2 +- components/molecules/VButton/VButton.vue | 30 ++++++++++++++---------- 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/assets/scss/_common.scss b/assets/scss/_common.scss index 1cd3c6e..989758d 100644 --- a/assets/scss/_common.scss +++ b/assets/scss/_common.scss @@ -1,14 +1,18 @@ :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)}; } @@ -16,6 +20,7 @@ html { --vw-ratio: 0.3; + font-size: calc((100vw / var(--size)) * (16 * var(--vw-ratio)) + 1rem * calc(1 - var(--vw-ratio))); } diff --git a/assets/scss/main.scss b/assets/scss/main.scss index 5b5d583..6a424bb 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -5,6 +5,7 @@ // @import "vendors/orejime"; // @import "vendors/tarteaucitron"; @import "plyr/src/sass/plyr"; + // functions @import "functions"; diff --git a/assets/scss/mixins/_component-vars.scss b/assets/scss/mixins/_component-vars.scss index d25895f..e1fe624 100644 --- a/assets/scss/mixins/_component-vars.scss +++ b/assets/scss/mixins/_component-vars.scss @@ -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 { diff --git a/assets/scss/variables/_v-button.scss b/assets/scss/variables/_v-button.scss index 9ea28d0..82d2956 100644 --- a/assets/scss/variables/_v-button.scss +++ b/assets/scss/variables/_v-button.scss @@ -45,7 +45,7 @@ $v-button-outlined: ( default: ( border-width: 2px, border-style: solid, - border-color: currentColor + border-color: currentcolor ), ); diff --git a/components/molecules/VButton/VButton.vue b/components/molecules/VButton/VButton.vue index bb4170a..31e3645 100644 --- a/components/molecules/VButton/VButton.vue +++ b/components/molecules/VButton/VButton.vue @@ -97,18 +97,21 @@ export default defineComponent({