Skip to content

fix(b-form-datepicker/b-form-timepicker): control size (closes #6246) #6249

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

Merged
jacobmllr95 merged 1 commit into from
Dec 23, 2020
+15 −14
Merged

fix(b-form-datepicker/b-form-timepicker): control size (closes #6246) #6249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/components/form-btn-label-control/_form-btn-label-control.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ $bv-form-btn-label-control-defined: false !default;
// Currently used by BFormTimepicker and BFormDatepicker
// Does not apply to button-only styling
.b-form-btn-label-control.form-control {
display: flex;
align-items: stretch;
height: auto;
padding: 0;
// Remove background validation images and padding from
// main wrapper as they will be present in the inner label element
background-image: none;
padding: 0;

@at-root {
// Handle input-group padding overrides
// Handle `.input-group` padding overrides
.input-group & {
padding: 0;
}
Expand Down Expand Up @@ -55,19 +58,23 @@ $bv-form-btn-label-control-defined: false !default;
padding: 0.5rem;
}

> label {
outline: 0;
> .form-control {
height: auto;
// Set a minimum height, as we have height set to `auto`
// (to allow the content to wrap, if needed)
// We subtract off the border, as we have border set to `0`
min-height: calc(#{$input-height} - #{$input-height-border});
padding-left: 0.25rem;
margin: 0;
border: 0;
outline: 0;
background: transparent;
word-break: break-word;
font-size: inherit;
white-space: normal;
@if $enable-pointer-cursor-for-buttons {
cursor: pointer;
}
// Set a minimum height, as we have height set to auto
// (to allow the content to wrap if needed)
// We subtract off the border, as we have border set to 0
min-height: calc(#{$input-height} - #{$input-height-border});

&.form-control-sm {
min-height: calc(#{$input-height-sm} - #{$input-height-border});
Expand Down
6 changes: 0 additions & 6 deletions src/components/form-btn-label-control/bv-form-btn-label-control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,6 @@ export const BVFormBtnLabelControl = /*#__PURE__*/ Vue.extend({
? 'sr-only' // Hidden in button only mode
: [
'form-control',
'text-break',
'text-wrap',
'bg-transparent',
// Mute the text if showing the placeholder
{ 'text-muted': !value },
this.stateClass,
Expand Down Expand Up @@ -255,9 +252,6 @@ export const BVFormBtnLabelControl = /*#__PURE__*/ Vue.extend({
{
'btn-group': buttonOnly,
'form-control': !buttonOnly,
'd-flex': !buttonOnly,
'h-auto': !buttonOnly,
'align-items-stretch': !buttonOnly,
focus: hasFocus && !buttonOnly,
show: visible,
'is-valid': state === true,
Expand Down