Skip to content
Permalink
Browse files
fix(b-form-datepicker, b-form-timepicker): fix menu padding in button…
… only mode (fixes #5251) (#5252)
  • Loading branch information
tmorehouse committed Apr 26, 2020
1 parent 05446f4 commit d57a643f0c6b5e805a42a3387fb0db4443bfc01f
Showing 4 changed files with 10 additions and 4 deletions.
@@ -133,3 +133,10 @@
}
}
}

// Button only mode menu padding overrides
.b-form-btn-label-control.btn-group {
> .dropdown-menu {
padding: 0.5rem;
}
}
@@ -84,7 +84,7 @@ describe('form-date', () => {
await waitRAF()

expect(wrapper.classes()).toContain('b-form-datepicker')
expect(wrapper.classes()).not.toContain('b-form-btn-label-control')
expect(wrapper.classes()).toContain('b-form-btn-label-control')
expect(wrapper.classes()).not.toContain('form-control')
expect(wrapper.classes()).toContain('dropdown')
expect(wrapper.classes()).not.toContain('show')
@@ -83,7 +83,7 @@ describe('form-timepicker', () => {
await waitRAF()

expect(wrapper.classes()).toContain('b-form-timepicker')
expect(wrapper.classes()).not.toContain('b-form-btn-label-control')
expect(wrapper.classes()).toContain('b-form-btn-label-control')
expect(wrapper.classes()).not.toContain('form-control')
expect(wrapper.classes()).toContain('dropdown')
expect(wrapper.classes()).not.toContain('show')
@@ -284,12 +284,11 @@ export const BVFormBtnLabelControl = /*#__PURE__*/ Vue.extend({
return h(
'div',
{
staticClass: 'dropdown',
staticClass: 'b-form-btn-label-control dropdown',
class: [
this.directionClass,
{
'btn-group': buttonOnly,
'b-form-btn-label-control': !buttonOnly,
'form-control': !buttonOnly,
[`form-control-${size}`]: !!size && !buttonOnly,
'd-flex': !buttonOnly,

0 comments on commit d57a643

Please sign in to comment.