Skip to content

Commit fab0137

Browse files
Merge release/2.4.1 into main branch (#1110)
1 parent 098514c commit fab0137

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+995
-620
lines changed

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@user-interviews/ui-design-system",
3-
"version": "2.4.0",
3+
"version": "2.4.1",
44
"dependencies": {
55
"@tiptap/core": "^2.0.3",
66
"@tiptap/extension-bold": "^2.0.3",
@@ -18,6 +18,7 @@
1818
"@tiptap/extension-text": "^2.0.3",
1919
"@tiptap/pm": "^2.0.3",
2020
"@tiptap/react": "^2.0.3",
21+
"@tiptap/suggestion": "^2.1.13",
2122
"@types/testing-library__jest-dom": "^6.0.0",
2223
"@typescript-eslint/eslint-plugin": "^2",
2324
"@typescript-eslint/parser": "^2",
@@ -29,6 +30,7 @@
2930
"react-toggle": "4.1.1",
3031
"react-transition-group": "^4.3.0",
3132
"sanitize-html": "^2.11.0",
33+
"tippy.js": "^6.3.7",
3234
"uuid": "^7.0.2"
3335
},
3436
"scripts": {

scss/avatars.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$avatar-small-height: 2.75rem;
2-
$avatar-small-width: 2.75rem;
1+
$avatar-small-height: 44px;
2+
$avatar-small-width: 44px;
33

4-
$avatar-large-height: 5rem;
5-
$avatar-large-width: 5rem;
4+
$avatar-large-height: 80px;
5+
$avatar-large-width: 80px;

scss/borders.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
$ux-border-radius: 0.25rem;
1+
$ux-border-radius: 4px;

scss/buttons.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ $warning: $ux-yellow-400;
2626

2727
@mixin btn-focus-outline {
2828
box-shadow: none !important;
29-
outline: 0.125rem solid $ux-blue-500;
30-
outline-offset: 0.125rem;
29+
outline: 2px solid $ux-blue-500;
30+
outline-offset: 2px;
3131
}
3232

3333
@mixin btn-focus-outline--dark-bg {
3434
box-shadow: none !important;
35-
outline: 0.125rem solid $ux-white;
36-
outline-offset: 0.125rem;
35+
outline: 2px solid $ux-white;
36+
outline-offset: 2px;
3737
}
3838

3939
@mixin btn-remove-bootstrap-focus-outline {

scss/cards.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +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;
1+
$card-xs-spacing: 16px;
2+
$card-sm-spacing: 20px;
3+
$card-spacing: 24px;
4+
$card-width: 896px;
5+
$card-width-md: 640px;
6+
$card-width-sm: 512px;
7+
$card-width-xs: 240px;

scss/drawer.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
$drawer-width-small: 32rem;
2-
$drawer-width-medium: 40rem;
3-
$drawer-width-large: 55.625rem;
1+
$drawer-width-small: 512px;
2+
$drawer-width-medium: 640px;
3+
$drawer-width-large: 890px;

scss/forms/control_button_group.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
display: flex;
33
flex-direction: row;
44
flex-wrap: wrap;
5-
margin-right: -0.5rem;
5+
margin-right: -8px;
66

77
&--full-width {
88
// This is a min-width because we are using a negative margin-right on the container
@@ -15,7 +15,7 @@
1515

1616
.FormControlLabel {
1717
flex: 1 1 0;
18-
min-width: 16rem;
18+
min-width: 256px;
1919
}
2020
}
2121

@@ -25,8 +25,8 @@
2525
flex-wrap: wrap;
2626

2727
.FormControlLabel--bordered {
28-
padding: 0.3125rem 0.625rem;
29-
margin-right: 0.5rem;
28+
padding: 5px 10px;
29+
margin-right: 8px;
3030

3131
input[type='radio'] {
3232
display: none;
@@ -36,7 +36,7 @@
3636

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

scss/forms/form_control_label.scss

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
align-items: center;
88
color: $ux-gray-900;
99
display: flex;
10-
margin-bottom: 0.5rem;
10+
margin-bottom: 8px;
1111

1212
&--with-children {
1313
@include synth-font-type-30--medium;
@@ -29,21 +29,20 @@
2929

3030
&__control {
3131
display: flex;
32-
margin-right: .5rem;
32+
margin-right: 8px;
3333
}
3434

3535
&__children {
36-
@include synth-font-type-30--medium;
36+
@include synth-font-type-30;
3737

38-
font-weight: 100;
39-
margin-top: 0.5rem;
38+
margin-top: 8px;
4039
width: 100%;
4140
}
4241

4342
&--bordered {
4443
border: 1px solid $ux-gray-400;
4544
border-radius: $ux-border-radius;
46-
padding: 1rem;
45+
padding: 16px;
4746
cursor: pointer;
4847

4948
&:hover {
@@ -68,8 +67,8 @@
6867
}
6968

7069
input[type='checkbox'], input[type='radio'] {
71-
min-height: 1rem;
72-
min-width: 1rem;
73-
margin-top: 0.125rem;
70+
min-height: 16px;
71+
min-width: 16px;
72+
margin-top: 2px;
7473
}
7574
}

scss/forms/form_group.scss

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@
77
align-items: flex-start;
88
display: flex;
99
flex-direction: column;
10-
margin: 0.5rem 0;
10+
margin: 8px 0;
1111

1212
&--bordered {
1313
border: 1px solid $ux-gray-400;
1414
border-radius: $ux-border-radius;
15-
padding: 1rem;
15+
padding: 16px;
1616

1717
.InputLabel {
1818
@include synth-font-type-30--bold;
19-
margin-bottom: 0.5rem;
19+
margin-bottom: 8px;
2020

2121
&__helper-text {
2222
@include synth-font-type-30;
23-
font-weight: 100;
2423
color: $ux-gray-900;
2524
}
2625
}
@@ -42,13 +41,13 @@
4241
flex-direction: row;
4342

4443
.InputLabel {
45-
margin-right: 1rem;
46-
margin-bottom: 0.5rem;
44+
margin-right: 16px;
45+
margin-bottom: 8px;
4746
}
4847

4948
.FormControlLabel {
5049
white-space: nowrap;
51-
margin-right: 1rem;
50+
margin-right: 16px;
5251
}
5352

5453
.FormControlLabel--active {
@@ -59,7 +58,7 @@
5958
&__helper-text {
6059
@include synth-font-type-20;
6160
color: $ux-gray-900;
62-
margin: 0 0 0.75rem;
61+
margin: 0 0 12px;
6362

6463
&--pre {
6564
white-space: pre-wrap;
@@ -69,7 +68,7 @@
6968
&__invalid-feedback {
7069
@include synth-font-type-20--medium;
7170
color: $ux-red;
72-
padding: .375rem 0;
71+
padding: 6px 0;
7372
margin: 0;
7473

7574
&__list {
@@ -79,7 +78,7 @@
7978

8079
.form-control {
8180
@include synth-font-type-30;
82-
height: 2.25rem;
81+
height: 36px;
8382
}
8483

8584
textarea.form-control {

scss/forms/input_label.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
display: flex;
77
align-items: center;
88
flex-wrap: wrap;
9-
margin-bottom: 0.375rem;
9+
margin-bottom: 6px;
1010

1111
&__helper-text {
1212
@include synth-font-type-10--uppercase;

0 commit comments

Comments
 (0)