Skip to content

fix(input-group): Styling fix for dropdowns, radio and checkbox groups. Fixes #2114,#1560 #2118

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
merged 7 commits into from
Oct 30, 2018
Merged

fix(input-group): Styling fix for dropdowns, radio and checkbox groups. Fixes #2114,#1560 #2118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a23c9e
Create input-group.css
tmorehouse Oct 30, 2018
318fb2f
import css into input-group
tmorehouse Oct 30, 2018
ae8a053
dropdown use input-group.css
tmorehouse Oct 30, 2018
13248fa
form-radio-group import input-group.css
tmorehouse Oct 30, 2018
dd7fad4
form-checkbox-group import input-group.css
tmorehouse Oct 30, 2018
2fbffbc
dropdown add comment
tmorehouse Oct 30, 2018
69171c4
dropdown.css replaced by input-group.css
tmorehouse Oct 30, 2018
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
16 changes: 0 additions & 16 deletions src/components/dropdown/dropdown.css
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/components/dropdown/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import idMixin from '../../mixins/id'
import dropdownMixin from '../../mixins/dropdown'
import bButton from '../button/button'

import './dropdown.css'
// Needed when dropdowns are inside an input group
import '../input-group/input-group.css'

export default {
mixins: [idMixin, dropdownMixin],
Expand Down
3 changes: 3 additions & 0 deletions src/components/form-checkbox/form-checkbox-group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import formCustomMixin from '../../mixins/form-custom'

import bFormCheckbox from './form-checkbox'

// Needed when checknox-groups are inside an input group
import '../input-group/input-group.css'

export default {
mixins: [
idMixin,
Expand Down
3 changes: 3 additions & 0 deletions src/components/form-radio/form-radio-group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import formStateMixin from '../../mixins/form-state'
import formCustomMixin from '../../mixins/form-custom'
import bFormRadio from './form-radio'

// Needed when radio-groups are inside an input group
import '../input-group/input-group.css'

export default {
mixins: [
idMixin,
Expand Down
17 changes: 17 additions & 0 deletions src/components/input-group/input-group.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* workaround for https://github.com/bootstrap-vue/bootstrap-vue/issues/1560 */
/* workaround for https://github.com/bootstrap-vue/bootstrap-vue/issues/2114 */
/* source: _input-group.scss */

.input-group > .input-group-prepend > .btn-group > .btn,
.input-group > .input-group-append:not(:last-child) > .btn-group > .btn,
.input-group > .input-group-append:last-child > .btn-group:not(:last-child):not(.dropdown-toggle) > .btn {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}

.input-group > .input-group-append > .btn-group > .btn,
.input-group > .input-group-prepend:not(:first-child) > .btn-group > .btn,
.input-group > .input-group-prepend:first-child > .btn-group:not(:first-child) > .btn {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
2 changes: 2 additions & 0 deletions src/components/input-group/input-group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import InputGroupPrepend from './input-group-prepend'
import InputGroupAppend from './input-group-append'
import InputGroupText from './input-group-text'

import './input-group.css'

export const props = {
id: {
type: String,
Expand Down