diff --git a/src/components/BaseButton/BaseButton.stories.ts b/src/components/BaseButton/BaseButton.stories.ts index 34e171d..d587b73 100644 --- a/src/components/BaseButton/BaseButton.stories.ts +++ b/src/components/BaseButton/BaseButton.stories.ts @@ -143,7 +143,7 @@ export const StyleVariables: StoryFn = { $base-button-font-weight: 800 $base-button-line-height: 21px $base-button-color: $white - $base-button-min-height: 37px + $base-button-height: 37px $base-button-padding: 0 16px $base-button-icon-margin: 6px $base-button-pill: 30px @@ -152,17 +152,17 @@ export const StyleVariables: StoryFn = { $base-button-box-shadow: 0px 3px 4px -2px rgba(18, 22, 31, 0.15) $base-button-icon-only-size: 38px - $base-button-large-min-height: 45px + $base-button-large-height: 45px $base-button-large-padding: 0 20px $base-button-icon-only-large-size: 48px - $base-button-small-min-height: 32px + $base-button-small-height: 32px $base-button-small-padding: 0 12px $base-button-small-font-size: 14px $base-button-icon-only-small-size: 30px $base-button-x-small-padding: 0 6px - $base-button-x-small-min-height: 26px + $base-button-x-small-height: 26px $base-button-icon-only-padding: 9px $base-button-icon-only-small-padding: 7px diff --git a/src/components/BaseButton/BaseButton.vue b/src/components/BaseButton/BaseButton.vue index 361be42..25800f5 100644 --- a/src/components/BaseButton/BaseButton.vue +++ b/src/components/BaseButton/BaseButton.vue @@ -62,7 +62,7 @@ font-family: $base-button-font-family line-height: $base-button-line-height font-weight: $base-button-font-weight - min-height: $base-button-min-height + height: $base-button-height color: $base-button-color background-color: transparent border-radius: $base-button-border-radius @@ -113,16 +113,16 @@ opacity: 0.3 pointer-events: none &.is--size-large - min-height: $base-button-large-min-height + height: $base-button-large-height padding: $base-button-large-padding font-size: $base-button-large-font-size line-height: $base-button-large-line-height &.is--size-small - min-height: $base-button-small-min-height + height: $base-button-small-height padding: $base-button-small-padding font-size: $base-button-small-font-size &.is--size-x-small - min-height: $base-button-x-small-min-height + height: $base-button-x-small-height padding: $base-button-x-small-padding &.is--bg-color-primary background-color: $base-button-primary-color diff --git a/src/components/BaseButton/index.sass b/src/components/BaseButton/index.sass index f6b40f2..478d552 100644 --- a/src/components/BaseButton/index.sass +++ b/src/components/BaseButton/index.sass @@ -6,8 +6,8 @@ $base-button-font-weight: 700 $base-button-line-height: 21px $base-button-color: $white $base-button-hover-color: $white -$base-button-min-height: 40px -$base-button-padding: 8px 16px +$base-button-height: 40px +$base-button-padding: 0 16px $base-button-icon-margin: 4px $base-button-pill: 30px $base-button-border-radius: 2px @@ -15,19 +15,19 @@ $base-button-border-width: 1px $base-button-box-shadow: 0px 2px 5px 1px rgba(18, 22, 31, 0.03), 0px 2px 3px -2px rgba(18, 22, 31, 0.15) $base-button-icon-only-size: 40px -$base-button-large-min-height: 48px -$base-button-large-padding: 12px 20px +$base-button-large-height: 48px +$base-button-large-padding: 0 20px $base-button-icon-only-large-size: 48px $base-button-large-font-size: 16px $base-button-large-line-height: 26px -$base-button-small-min-height: 32px -$base-button-small-padding: 6px 12px +$base-button-small-height: 32px +$base-button-small-padding: 0 12px $base-button-small-font-size: 12px $base-button-icon-only-small-size: 32px $base-button-x-small-padding: 0 6px -$base-button-x-small-min-height: 26px +$base-button-x-small-height: 26px $base-button-icon-only-padding: 9px $base-button-icon-only-small-padding: 7px diff --git a/src/components/BaseCardFeatures/BaseCardFeatures.vue b/src/components/BaseCardFeatures/BaseCardFeatures.vue index 1d4d47c..6a17815 100644 --- a/src/components/BaseCardFeatures/BaseCardFeatures.vue +++ b/src/components/BaseCardFeatures/BaseCardFeatures.vue @@ -18,20 +18,22 @@ class="BaseCardFeatures base-card-features is--hover-elevate-up is--hover-visible-elevate-up-wrapper" >
- +
+ - - {{ buttonText}} - - + + {{ buttonText}} + + +
@@ -39,6 +41,8 @@ diff --git a/src/components/BaseCarousel/BaseCarousel.vue b/src/components/BaseCarousel/BaseCarousel.vue index 9a82333..6882676 100644 --- a/src/components/BaseCarousel/BaseCarousel.vue +++ b/src/components/BaseCarousel/BaseCarousel.vue @@ -166,12 +166,12 @@ const onClick = () => {