Skip to content

Commit ee5768c

Browse files
floziaflozia
committed
merge: Resolve conflicts with main
2 parents ef97831 + 324715d commit ee5768c

File tree

82 files changed

+1780
-1755
lines changed

Some content is hidden

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

82 files changed

+1780
-1755
lines changed

‎package-lock.json‎

Lines changed: 144 additions & 144 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
"npm": "10.1.0"
7171
},
7272
"dependencies": {
73-
"@aws-sdk/client-s3": "^3.717.0",
74-
"@aws-sdk/lib-storage": "^3.717.0",
73+
"@aws-sdk/client-s3": "^3.722.0",
74+
"@aws-sdk/lib-storage": "^3.722.0",
7575
"@fluent/bundle": "^0.18.0",
7676
"@fluent/langneg": "^0.7.0",
7777
"@fluent/react": "^0.15.2",
@@ -98,7 +98,7 @@
9898
"jwk-to-pem": "^2.0.7",
9999
"knex": "^3.1.0",
100100
"mjml": "^4.15.3",
101-
"next": "^14.2.15",
101+
"next": "^14.2.22",
102102
"next-auth": "^4.24.11",
103103
"nodemailer": "^6.9.16",
104104
"pg": "^8.13.1",

‎src/app/(proper_react)/(redesign)/(authenticated)/admin/dev/UserAdmin.module.scss‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
@import "../../../../../tokens";
1+
@use "../../../../../tokens";
22

33
.wrapper {
44
display: flex;
55
flex-direction: column;
6-
gap: $spacing-2xl;
7-
background-color: $color-grey-05;
6+
gap: tokens.$spacing-2xl;
7+
background-color: tokens.$color-grey-05;
88
height: 100%;
9-
padding: $layout-lg $layout-2xl;
9+
padding: tokens.$layout-lg tokens.$layout-2xl;
1010

11-
@media screen and (max-width: $screen-lg) {
12-
padding: $spacing-lg;
11+
@media screen and (max-width: tokens.$screen-lg) {
12+
padding: tokens.$spacing-lg;
1313
}
1414
}
1515

1616
.header {
17-
font: $text-title-xs;
17+
font: tokens.$text-title-xs;
1818
font-weight: normal;
1919

2020
b {
@@ -25,33 +25,33 @@
2525
.form {
2626
display: flex;
2727
flex-direction: column;
28-
gap: $spacing-2xl;
28+
gap: tokens.$spacing-2xl;
2929

3030
.userPicker {
3131
flex: 1 0 auto;
3232
align-items: center;
3333
display: flex;
3434
flex-wrap: wrap;
35-
gap: $spacing-2xl;
36-
min-height: $layout-2xl;
35+
gap: tokens.$spacing-2xl;
36+
min-height: tokens.$layout-2xl;
3737

3838
label {
3939
display: flex;
4040
flex-direction: column;
41-
gap: $spacing-sm;
41+
gap: tokens.$spacing-sm;
4242
min-width: 50%;
4343
}
4444

4545
input {
46-
padding: $spacing-sm;
47-
font: $text-body-md;
46+
padding: tokens.$spacing-sm;
47+
font: tokens.$text-body-md;
4848
}
4949
}
5050

5151
.actions {
5252
display: flex;
5353
flex-wrap: wrap;
54-
gap: $spacing-xl;
54+
gap: tokens.$spacing-xl;
5555

5656
button {
5757
flex: 1 1 25%;
@@ -60,9 +60,9 @@
6060
}
6161

6262
.status {
63-
background-color: $color-yellow-05;
64-
border: 2px solid $color-yellow-20;
65-
border-radius: $border-radius-sm;
66-
padding: $spacing-md $spacing-lg;
67-
font: $text-body-md;
63+
background-color: tokens.$color-yellow-05;
64+
border: 2px solid tokens.$color-yellow-20;
65+
border-radius: tokens.$border-radius-sm;
66+
padding: tokens.$spacing-md tokens.$spacing-lg;
67+
font: tokens.$text-body-md;
6868
}

‎src/app/(proper_react)/(redesign)/(authenticated)/admin/emails/EmailTrigger.module.scss‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
@import "../../../../../tokens";
1+
@use "../../../../../tokens";
22

33
.wrapper {
44
display: flex;
55
flex-direction: column;
6-
gap: $spacing-2xl;
7-
background-color: $color-grey-05;
6+
gap: tokens.$spacing-2xl;
7+
background-color: tokens.$color-grey-05;
88
height: 100%;
9-
padding: $layout-lg $layout-2xl;
9+
padding: tokens.$layout-lg tokens.$layout-2xl;
1010

11-
@media screen and (max-width: $screen-lg) {
12-
padding: $spacing-lg;
11+
@media screen and (max-width: tokens.$screen-lg) {
12+
padding: tokens.$spacing-lg;
1313
}
1414
}
1515

1616
.addressSection {
1717
display: flex;
1818
flex-direction: column;
19-
gap: $spacing-sm;
19+
gap: tokens.$spacing-sm;
2020

2121
.addressPicker {
2222
display: flex;
2323
align-items: center;
24-
gap: $spacing-md;
24+
gap: tokens.$spacing-md;
2525

2626
label {
27-
font: $text-body-lg;
27+
font: tokens.$text-body-lg;
2828
font-weight: 700;
2929
}
3030

3131
select {
32-
padding: $spacing-sm;
32+
padding: tokens.$spacing-sm;
3333
}
3434
}
3535
}
3636

3737
.triggers {
3838
display: flex;
3939
flex-wrap: wrap;
40-
gap: $spacing-lg;
40+
gap: tokens.$spacing-lg;
4141
}

‎src/app/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/components/FlagEditor.module.scss‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
@import "../../../../../../tokens";
1+
@use "../../../../../../tokens";
22

33
.flagWrapper {
44
display: flex;
55
flex-direction: column;
6-
gap: $spacing-lg;
7-
background-color: $color-white;
8-
padding: $spacing-lg;
9-
border-radius: $border-radius-md;
10-
max-width: $content-sm;
6+
gap: tokens.$spacing-lg;
7+
background-color: tokens.$color-white;
8+
padding: tokens.$spacing-lg;
9+
border-radius: tokens.$border-radius-md;
10+
max-width: tokens.$content-sm;
1111
}
1212

1313
.flagName {
14-
font: $text-title-3xs;
14+
font: tokens.$text-title-3xs;
1515
}
1616

1717
.enabledControl {
1818
display: flex;
19-
gap: $spacing-xs;
20-
font: $text-body-lg;
19+
gap: tokens.$spacing-xs;
20+
font: tokens.$text-body-lg;
2121
}
2222

2323
.allowListWrapper {
2424
display: flex;
2525
flex-direction: column;
26-
gap: $spacing-md;
26+
gap: tokens.$spacing-md;
2727

2828
h4 {
29-
font: $text-body-md;
29+
font: tokens.$text-body-md;
3030
font-weight: bold;
3131
}
3232
}
@@ -35,16 +35,16 @@
3535
flex-grow: 1;
3636
display: flex;
3737
flex-direction: column;
38-
gap: $spacing-xs;
38+
gap: tokens.$spacing-xs;
3939
padding: 0;
4040
list-style-type: none;
4141
}
4242

4343
.addressListing {
4444
display: flex;
4545
align-items: center;
46-
gap: $spacing-xs;
47-
font: $text-body-md;
46+
gap: tokens.$spacing-xs;
47+
font: tokens.$text-body-md;
4848
font-family: monospace;
4949

5050
:first-child {
@@ -54,25 +54,25 @@
5454
button {
5555
background-color: transparent;
5656
border: none;
57-
border-radius: $border-radius-xl;
57+
border-radius: tokens.$border-radius-xl;
5858
aspect-ratio: 1;
5959

6060
&:hover {
6161
cursor: pointer;
62-
background-color: $color-red-70;
63-
color: $color-white;
62+
background-color: tokens.$color-red-70;
63+
color: tokens.$color-white;
6464
}
6565
}
6666

6767
&:has(button:hover) {
68-
color: $color-red-70;
68+
color: tokens.$color-red-70;
6969
}
7070
}
7171

7272
.addressAdder {
7373
display: flex;
7474
align-items: center;
75-
gap: $spacing-sm;
75+
gap: tokens.$spacing-sm;
7676

7777
input[type="email"] {
7878
flex-grow: 1;
@@ -87,15 +87,15 @@
8787
align-items: center;
8888
height: 100%;
8989
background-color: transparent;
90-
color: $color-blue-50;
90+
color: tokens.$color-blue-50;
9191
border: none;
92-
border-radius: $border-radius-sm;
93-
padding: $spacing-sm;
92+
border-radius: tokens.$border-radius-sm;
93+
padding: tokens.$spacing-sm;
9494

9595
&:hover {
9696
cursor: pointer;
97-
background-color: $color-blue-50;
98-
color: $color-white;
97+
background-color: tokens.$color-blue-50;
98+
color: tokens.$color-white;
9999
}
100100
}
101101
/* stylelint-enable no-descending-specificity */

‎src/app/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/page.module.scss‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
@import "../../../../../tokens";
1+
@use "../../../../../tokens";
22

33
.wrapper {
44
width: 100%;
55
height: 100%;
6-
background-color: $color-grey-05;
6+
background-color: tokens.$color-grey-05;
77
overflow: auto;
88

99
.tabBar {
10-
height: $tab-bar-height;
11-
border-bottom: 1px solid $color-grey-20;
10+
height: tokens.$tab-bar-height;
11+
border-bottom: 1px solid tokens.$color-grey-20;
1212
display: flex;
1313
align-items: center;
1414

1515
.start {
1616
flex: 1 0 auto;
1717
display: flex;
1818
align-items: center;
19-
padding-inline: $spacing-2xl;
19+
padding-inline: tokens.$spacing-2xl;
2020
}
2121

2222
.end {
23-
padding-inline: $spacing-xl;
23+
padding-inline: tokens.$spacing-xl;
2424
}
2525

26-
@media screen and (max-width: $screen-md) {
26+
@media screen and (max-width: tokens.$screen-md) {
2727
.start {
2828
justify-content: center;
2929
}
@@ -35,7 +35,7 @@
3535
}
3636

3737
.main {
38-
padding: $spacing-lg 0;
38+
padding: tokens.$spacing-lg 0;
3939
}
4040

4141
th,
@@ -45,15 +45,15 @@
4545
}
4646

4747
h3 {
48-
padding: 0 $spacing-2xl;
49-
font: $text-title-2xs;
48+
padding: 0 tokens.$spacing-2xl;
49+
font: tokens.$text-title-2xs;
5050
}
5151
}
5252

5353
.flagList {
5454
display: grid;
55-
grid-template-columns: repeat(auto-fit, minmax($content-xs, 1fr));
55+
grid-template-columns: repeat(auto-fit, minmax(tokens.$content-xs, 1fr));
5656
justify-content: flex-start;
57-
gap: $spacing-lg;
58-
padding: $spacing-2xl;
57+
gap: tokens.$spacing-lg;
58+
padding: tokens.$spacing-2xl;
5959
}

0 commit comments

Comments
 (0)