Skip to content

Commit

Permalink
fix(VBtn): correct font-size for different VBtn sizes (#8385)
Browse files Browse the repository at this point in the history
* fix(VBtn): correct font-size for different VBtn sizes

fixes #8358

* fix(VBtn): adjust font sizes
  • Loading branch information
obennaci authored and johnleider committed Aug 15, 2019
1 parent f676454 commit c67b666
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
5 changes: 4 additions & 1 deletion packages/vuetify/src/components/VBtn/VBtn.sass
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
border-radius: $btn-border-radius
display: inline-flex
flex: 0 0 auto
font-size: $btn-font-size
font-weight: $btn-font-weight
letter-spacing: $btn-letter-spacing
justify-content: center
Expand All @@ -60,6 +59,10 @@
vertical-align: middle
white-space: nowrap

@each $name, $size in $btn-font-sizes
&.v-size--#{$name}
font-size: $size

&:before
border-radius: inherit
bottom: 0
Expand Down
8 changes: 7 additions & 1 deletion packages/vuetify/src/components/VBtn/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
$btn-active-opacity: 0.18 !default;
$btn-border-radius: 4px !default;
$btn-focus-opacity: 0.24 !default;
$btn-font-size: .875rem !default;
$btn-font-weight: 500 !default;
$btn-hover-opacity: 0.08 !default;
$btn-letter-spacing: .0892857143em !default;
Expand All @@ -16,6 +15,13 @@ $btn-sizes: (
'large': 44,
'x-large': 52
) !default;
$btn-font-sizes: (
'x-small': .625rem,
'small': .75rem,
'default': .875rem,
'large': 1rem,
'x-large': 1.125rem
) !default;
$fab-sizes: (
'x-small': 32,
'small': 40,
Expand Down

0 comments on commit c67b666

Please sign in to comment.