Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(b-form-datepicker, b-form-timepicker): adjust scss to support input-groups #5231

Merged
merged 6 commits into from Apr 23, 2020
Merged

fix(b-form-datepicker, b-form-timepicker): adjust scss to support input-groups #5231

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
764fca7
fix(b-form-datepicker, b-form-timepicker): adjust scss to support inp…
tmorehouse Apr 23, 2020
54a208d
Update _custom-controls.scss
tmorehouse Apr 23, 2020
2423764
Merge branch 'dev' into date-time-input-group
jacobmllr95 Apr 23, 2020
62bfbb4
Merge branch 'dev' into date-time-input-group
tmorehouse Apr 23, 2020
79af849
Merge branch 'dev' into date-time-input-group
tmorehouse Apr 23, 2020
8570aa3
Update _custom-controls.scss
tmorehouse Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/_custom-controls.scss
View file
Open in desktop
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