Skip to content

Commit

Permalink
fix(floating-label): font-size and height based on input-font-size
Browse files Browse the repository at this point in the history
  • Loading branch information
GeorgeGindev authored and joneff committed Nov 4, 2020
1 parent 4af09a0 commit 0c61a43
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/floating-label/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$floating-label-scale: 1 !default;
$floating-label-font-size: $input-font-size !default;
$floating-label-line-height: $input-line-height !default;
$floating-label-height: calc( #{$floating-label-line-height} * 1em ) !default;
$floating-label-height: calc( #{$floating-label-line-height} * #{$floating-label-font-size} ) !default;
$floating-label-offset-x: calc( #{$input-padding-x} + #{$input-border-width} ) !default;
$floating-label-offset-y: calc( #{$floating-label-height} + #{$input-border-width} + #{$input-padding-y} ) !default;

Expand Down
2 changes: 1 addition & 1 deletion packages/classic/scss/floating-label/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$floating-label-scale: 1 !default;
$floating-label-font-size: $input-font-size !default;
$floating-label-line-height: $input-line-height !default;
$floating-label-height: calc( #{$floating-label-line-height} * 1em ) !default;
$floating-label-height: calc( #{$floating-label-line-height} * #{$floating-label-font-size} ) !default;
$floating-label-offset-x: calc( #{$input-padding-x} + #{$input-border-width} ) !default;
$floating-label-offset-y: calc( #{$floating-label-height} + #{$input-border-width} + #{$input-padding-y} ) !default;

Expand Down
2 changes: 1 addition & 1 deletion packages/default/scss/floating-label/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$floating-label-scale: 1 !default;
$floating-label-font-size: $input-font-size !default;
$floating-label-line-height: $input-line-height !default;
$floating-label-height: calc( #{$floating-label-line-height} * 1em ) !default;
$floating-label-height: calc( #{$floating-label-line-height} * #{$floating-label-font-size} ) !default;
$floating-label-offset-x: calc( #{$input-padding-x} + #{$input-border-width} ) !default;
$floating-label-offset-y: calc( #{$floating-label-height} + #{$input-border-width} + #{$input-padding-y} ) !default;

Expand Down
2 changes: 1 addition & 1 deletion packages/material/scss/floating-label/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$floating-label-scale: 1 !default;
$floating-label-font-size: $input-font-size !default;
$floating-label-line-height: $input-line-height !default;
$floating-label-height: calc( #{$floating-label-line-height} * #{$input-font-size} ) !default;
$floating-label-height: calc( #{$floating-label-line-height} * #{$floating-label-font-size} ) !default;
$floating-label-offset-x: null !default;
$floating-label-offset-y: calc( #{$floating-label-height} + #{$input-border-width} + #{$input-padding-y} ) !default;

Expand Down

0 comments on commit 0c61a43

Please sign in to comment.