Skip to content

Commit d9a4521

Browse files
authored
upgrade DS to 'bootstrap' v5.0 (#378)
* upgrade dev and peer dependencies * remove bootstrap from Alert.scss * update ModalHeader close button * fix alignment and margin issues that appeared on form elements * fix issue where leading/trailing icons were not sized properly * implement feedback
1 parent eef0297 commit d9a4521

File tree

13 files changed

+267
-184
lines changed

13 files changed

+267
-184
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@fortawesome/pro-solid-svg-icons": "^5.15.3",
3939
"@fortawesome/react-fontawesome": "^0.1.9",
4040
"@popperjs/core": "^2.5.3",
41-
"bootstrap": "^4.3.1",
41+
"bootstrap": "5.0",
4242
"classnames": "^2.2.5",
4343
"node-sass": "^4.13.0",
4444
"prop-types": "^15.6.1",
@@ -79,7 +79,7 @@
7979
"babel-plugin-module-resolver": "^4.0.0",
8080
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
8181
"babel-preset-react": "^6.24.1",
82-
"bootstrap": "^4.3.1",
82+
"bootstrap": "5.0",
8383
"classnames": "^2.2.5",
8484
"css-loader": "^3.4.2",
8585
"eslint": "^6.8.0",

scss/forms/control_button_group.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
.FormControlLabel {
3838
flex-wrap: wrap;
39-
margin-right: 0.5rem;
39+
margin: 0 0.5rem 0.5rem 0;
4040
display: block;
4141
}
4242
}

scss/forms/form_control_label.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
align-items: center;
88
color: $ux-gray-900;
99
display: flex;
10+
margin-bottom: 0.5rem;
1011

1112
&--with-children {
1213
@include font-type-30;

scss/forms/form_group.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
}
3939

4040
&--inline {
41-
align-items: center;
4241
display: flex;
4342
flex-direction: row;
4443

0 commit comments

Comments
 (0)