Skip to content

Commit cad4615

Browse files
Merge release/1.36.0 into main branch (#753)
* Add aria-label for trailingIconOnClickSubmit Input (#751) * add Grid components (Container, Row, Col) (#750) * add Popover (#717)
1 parent 2019001 commit cad4615

29 files changed

+2185
-139
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "@user-interviews/ui-design-system",
3-
"version": "1.35.0",
3+
"version": "1.36.0",
44
"dependencies": {
5-
"react-bootstrap": "^2.0.2",
5+
"react-bootstrap": "^2.5.0",
66
"react-router-dom": "^5.2.0",
77
"react-select": "^5.0.0",
88
"react-toggle": "4.1.1",

scss/cards.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
$card-xs-spacing: 1rem;
2+
$card-sm-spacing: 1.25rem;
3+
$card-spacing: 1.5rem;
4+
$card-width: 56rem;
5+
$card-width-md: 40rem;
6+
$card-width-sm: 32rem;
7+
$card-width-xs: 15rem;

scss/theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
@import './borders';
44
@import './box_shadow';
55
@import './buttons';
6+
@import './cards';
67
@import './colors';
78
@import './elevations';
89
@import './inputs';

scss/z_stack.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// Note look to update `z_stack.js` when changing these
1010

1111
// By Level
12+
$z-index-1050: 1050;
1213
$z-index-1045: 1045;
1314
$z-index-1040: 1040;
1415
$z-index-1030: 1030;
@@ -26,6 +27,7 @@ $z-index-2: 2;
2627
$z-index-1: 1;
2728

2829
// By Purpose
30+
$z-index-popover: $z-index-1050;
2931
$z-index-flash: $z-index-1045;
3032
$z-index-drawer: $z-index-1040;
3133
$z-index-modal-backdrop: $z-index-1040; // Matches bootstrap $zindex-modal-backdrop

0 commit comments

Comments
 (0)