Skip to content

Commit

Permalink
fix(b-form-datepicker, b-form-timepicker): adjust scss to support inp…
Browse files Browse the repository at this point in the history
…ut-groups (#5231)

Co-authored-by: Jacob Müller
  • Loading branch information
tmorehouse committed Apr 23, 2020
1 parent 6354e6e commit 7b1adc4
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions src/_custom-controls.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@
background-image: none;
padding: 0;

@at-root {
// Handle input-group padding overrides
.input-group & {
padding: 0;
}
}

@at-root {
// Prevent the button/label from reversing order on in horizontal RTL mode
[dir="rtl"] &,
Expand Down Expand Up @@ -78,6 +85,7 @@
padding-left: 0.25rem;
margin: 0;
border: 0;
font-size: inherit;
@if $enable-pointer-cursor-for-buttons {
cursor: pointer;
}
Expand All @@ -93,6 +101,21 @@
&.form-control-lg {
min-height: calc(#{$input-height-lg} - #{$input-height-border});
}

@at-root {
// Handle input group sizing
.input-group.input-group-sm & {
min-height: calc(#{$input-height-sm} - #{$input-height-border});
padding-top: $input-padding-y-sm;
padding-bottom: $input-padding-y-sm
}

.input-group.input-group-lg & {
min-height: calc(#{$input-height-lg} - #{$input-height-border});
padding-top: $input-padding-y-lg;
padding-bottom: $input-padding-y-lg
}
}
}

// Disabled and read-only styling
Expand Down

0 comments on commit 7b1adc4

Please sign in to comment.