Skip to content

Commit da39961

Browse files
committed
Support different line heights for buttons.
1 parent f8fa05d commit da39961

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

scss/_buttons.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@
199199
//
200200

201201
.btn-lg {
202-
@include button-size($btn-padding-y-lg, $btn-padding-x-lg, $btn-font-size-lg, $btn-border-radius-lg);
202+
@include button-size($btn-padding-y-lg, $btn-padding-x-lg, $btn-font-size-lg, $btn-border-radius-lg, $btn-line-height-lg);
203203
}
204204

205205
.btn-sm {
206-
@include button-size($btn-padding-y-sm, $btn-padding-x-sm, $btn-font-size-sm, $btn-border-radius-sm);
206+
@include button-size($btn-padding-y-sm, $btn-padding-x-sm, $btn-font-size-sm, $btn-border-radius-sm, $btn-line-height-sm);
207207
}

scss/_variables.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,10 +787,12 @@ $input-btn-focus-box-shadow: $focus-ring-box-shadow !default;
787787
$input-btn-padding-y-sm: .25rem !default;
788788
$input-btn-padding-x-sm: .5rem !default;
789789
$input-btn-font-size-sm: $font-size-sm !default;
790+
$input-btn-line-height-sm: $line-height-sm !default;
790791

791792
$input-btn-padding-y-lg: .5rem !default;
792793
$input-btn-padding-x-lg: 1rem !default;
793794
$input-btn-font-size-lg: $font-size-lg !default;
795+
$input-btn-line-height-lg: $line-height-lg !default;
794796

795797
$input-btn-border-width: var(--#{$prefix}border-width) !default;
796798
// scss-docs-end input-btn-variables
@@ -811,10 +813,12 @@ $btn-white-space: null !default; // Set to `nowrap` to prevent text
811813
$btn-padding-y-sm: $input-btn-padding-y-sm !default;
812814
$btn-padding-x-sm: $input-btn-padding-x-sm !default;
813815
$btn-font-size-sm: $input-btn-font-size-sm !default;
816+
$btn-line-height-sm: $input-btn-line-height-sm !default;
814817

815818
$btn-padding-y-lg: $input-btn-padding-y-lg !default;
816819
$btn-padding-x-lg: $input-btn-padding-x-lg !default;
817820
$btn-font-size-lg: $input-btn-font-size-lg !default;
821+
$btn-line-height-lg: $input-btn-line-height-lg !default;
818822

819823
$btn-border-width: $input-btn-border-width !default;
820824

scss/mixins/_buttons.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,11 @@
6161
// scss-docs-end btn-outline-variant-mixin
6262

6363
// scss-docs-start btn-size-mixin
64-
@mixin button-size($padding-y, $padding-x, $font-size, $border-radius) {
64+
@mixin button-size($padding-y, $padding-x, $font-size, $border-radius, $line-height) {
6565
--#{$prefix}btn-padding-y: #{$padding-y};
6666
--#{$prefix}btn-padding-x: #{$padding-x};
6767
@include rfs($font-size, --#{$prefix}btn-font-size);
68+
--#{$prefix}btn-line-height: #{$line-height};
6869
--#{$prefix}btn-border-radius: #{$border-radius};
6970
}
7071
// scss-docs-end btn-size-mixin

0 commit comments

Comments
 (0)