Skip to content

Commit eed8cc2

Browse files
filipslezaklabfilipslezaklab
authored
fix messagebox spacing (#1109)
1 parent cf60491 commit eed8cc2

File tree

17 files changed

+260
-222
lines changed

17 files changed

+260
-222
lines changed

‎web/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"@react-rxjs/core": "^0.10.8",
4848
"@stablelib/base64": "^2.0.1",
4949
"@stablelib/x25519": "^2.0.1",
50-
"@tanstack/query-core": "^5.74.0",
51-
"@tanstack/react-query": "^5.74.0",
50+
"@tanstack/query-core": "^5.74.3",
51+
"@tanstack/react-query": "^5.74.3",
5252
"@tanstack/react-virtual": "3.0.0-beta.9",
5353
"@tanstack/virtual-core": "3.0.0-beta.9",
5454
"@use-gesture/react": "^10.3.1",
@@ -63,7 +63,7 @@
6363
"events": "^3.3.0",
6464
"fast-deep-equal": "^3.1.3",
6565
"file-saver": "^2.0.5",
66-
"framer-motion": "^12.6.5",
66+
"framer-motion": "^12.7.3",
6767
"fuse.js": "^7.1.0",
6868
"get-text-width": "^1.0.3",
6969
"hex-rgb": "^5.0.0",
@@ -101,7 +101,7 @@
101101
"text-case": "^1.0.9",
102102
"typesafe-i18n": "^5.26.2",
103103
"use-breakpoint": "^4.0.6",
104-
"zod": "^3.24.2",
104+
"zod": "^3.24.3",
105105
"zustand": "^5.0.3"
106106
},
107107
"devDependencies": {
@@ -111,7 +111,7 @@
111111
"@eslint/js": "^9.24.0",
112112
"@hookform/devtools": "^4.4.0",
113113
"@stylistic/eslint-plugin-ts": "^4.2.0",
114-
"@tanstack/react-query-devtools": "^5.74.0",
114+
"@tanstack/react-query-devtools": "^5.74.3",
115115
"@types/byte-size": "^8.1.2",
116116
"@types/file-saver": "^2.0.7",
117117
"@types/humanize-duration": "^3.27.4",
@@ -121,9 +121,9 @@
121121
"@types/react-dom": "^18.2.18",
122122
"@types/react-router-dom": "^5.3.3",
123123
"@types/react-window": "^1.8.8",
124-
"@typescript-eslint/eslint-plugin": "^8.29.1",
125-
"@typescript-eslint/parser": "^8.29.1",
126-
"@vitejs/plugin-react-swc": "^3.8.1",
124+
"@typescript-eslint/eslint-plugin": "^8.30.1",
125+
"@typescript-eslint/parser": "^8.30.1",
126+
"@vitejs/plugin-react-swc": "^3.9.0",
127127
"autoprefixer": "^10.4.21",
128128
"concurrently": "^9.1.2",
129129
"dotenv": "^16.5.0",
@@ -143,9 +143,9 @@
143143
"sass": "^1.70.0",
144144
"standard-version": "^9.5.0",
145145
"typescript": "~5.8.3",
146-
"typescript-eslint": "^8.29.1",
146+
"typescript-eslint": "^8.30.1",
147147
"typescript-eslint-language-service": "^5.0.5",
148-
"vite": "^6.2.6",
148+
"vite": "^6.3.1",
149149
"vite-plugin-eslint": "^1.8.1",
150150
"vite-plugin-package-version": "^1.1.0"
151151
}

‎web/pnpm-lock.yaml

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

‎web/src/pages/addDevice/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
box-sizing: border-box;
4040
padding: 55px;
4141

42-
.message-box {
43-
margin-bottom: 20px;
42+
.message-box-spacer {
43+
padding-bottom: 20px;
4444
}
4545

4646
form {

‎web/src/pages/devices/modals/AddStandaloneDeviceModal/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
box-sizing: border-box;
3636
padding: 0 55px;
3737

38-
.message-box {
39-
margin-bottom: 20px;
38+
.message-box-spacer {
39+
padding-bottom: 20px;
4040
}
4141
}
4242

‎web/src/pages/enrollment/components/EnrollmentEmail/style.scss

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
@use '@scssutils' as *;
22

33
#enrollment-email {
4-
& > .message-box {
5-
margin-bottom: 26px;
6-
background-color: var(--surface-tag-modal);
4+
& > .message-box-spacer {
5+
padding-bottom: 26px;
6+
7+
.message-box {
8+
background-color: var(--surface-tag-modal);
9+
}
710
}
811

912
& > .card {
@@ -58,6 +61,7 @@
5861
width: 100%;
5962
min-height: 700px;
6063
overflow: hidden;
64+
6165
& > textarea {
6266
min-height: 660px;
6367
width: 100%;

‎web/src/pages/enrollment/components/EnrollmentWelcomeMessage/style.scss

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
@use '@scssutils' as *;
22

33
#enrollment-welcome-message {
4-
& > .message-box {
5-
margin-bottom: 26px;
6-
background-color: var(--surface-tag-modal);
4+
& > .message-box-spacer {
5+
padding-bottom: 26px;
6+
7+
.message-box {
8+
background-color: var(--surface-tag-modal);
9+
}
710
}
811

912
& > .card {
@@ -26,6 +29,7 @@
2629
}
2730
}
2831
}
32+
2933
& > .text-wrapper {
3034
border-radius: 15px;
3135
box-sizing: border-box;
@@ -34,6 +38,7 @@
3438
width: 100%;
3539
min-height: 700px;
3640
overflow: hidden;
41+
3742
& > textarea {
3843
min-height: 660px;
3944
width: 100%;

‎web/src/pages/network/NetworkEditForm/style.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.network-setup {
33
.network-config {
44
& > .card {
5-
padding: 1.5rem 3rem 4rem;
5+
padding: 15px 30px 40px;
66

77
& > form {
88
justify-content: flex-start;
@@ -14,16 +14,16 @@
1414
}
1515

1616
& > label {
17-
margin-bottom: 1.2rem;
17+
margin-bottom: 12px;
1818
}
1919

2020
& > .input-container {
2121
width: 100%;
2222
}
2323

24-
& > .message-box {
24+
& > .message-box-spacer {
2525
&:not(:last-child) {
26-
margin-bottom: 2.5rem;
26+
padding-bottom: 25px;
2727
}
2828
}
2929
}

‎web/src/pages/network/NetworkGateway/style.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
}
1212
}
1313

14-
& > .message-box {
15-
min-height: 15px;
16-
margin-bottom: 20px;
14+
& > .message-box-spacer {
15+
padding-bottom: 20px;
1716

1817
@include media-breakpoint-up(lg) {
19-
margin-bottom: 40px;
18+
padding-bottom: 40px;
2019
}
2120
}
2221

@@ -59,6 +58,7 @@
5958
& > a {
6059
color: var(--text-body-secondary);
6160
}
61+
6262
@include typography(app-modal-2);
6363
color: var(--text-body-secondary);
6464
}

‎web/src/pages/network/style.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
height: auto;
1818
margin-bottom: 5px;
1919
width: 100%;
20+
2021
& > h1 {
2122
user-select: none;
2223

@@ -25,6 +26,7 @@
2526

2627
@include media-breakpoint-up(lg) {
2728
display: block;
29+
2830
& > h1 {
2931
line-height: 62px;
3032
}
@@ -100,9 +102,9 @@
100102
}
101103
}
102104

103-
.message-box {
105+
.message-box-spacer {
104106
&:not(:last-child) {
105-
margin-bottom: 20px;
107+
padding-bottom: 20px;
106108
}
107109
}
108110

@@ -111,9 +113,9 @@
111113
width: 100%;
112114
}
113115

114-
& > .message-box {
116+
& > .message-box-spacer {
115117
&:not(:last-child) {
116-
margin-bottom: 32px;
118+
padding-bottom: 32px;
117119
}
118120
}
119121

‎web/src/pages/users/UserProfile/UserAuthInfo/modals/ManageWebAuthNModal/style.scss

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
padding-bottom: 26px;
33

44
& > .content {
5-
& > .message-box {
5+
& > .message-box-spacer {
66
box-sizing: border-box;
7-
min-height: 70px;
8-
margin-bottom: 20px;
7+
padding-bottom: 20px;
98

109
@include media-breakpoint-up(lg) {
11-
width: calc(100% - 60px);
12-
margin: 0 30px 34px;
10+
padding: 0 30px 34px;
1311
}
1412
}
1513

‎web/src/pages/users/UserProfile/UserAuthInfo/modals/RecoveryCodesModal/style.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#view-recovery-codes {
22
.content {
3-
& > .message-box {
4-
width: calc(100% - 6rem);
5-
margin: 0 3rem;
6-
min-height: 70px;
3+
& > .message-box-spacer {
4+
padding: 0 30px;
75
}
86

97
& > .codes {

‎web/src/pages/users/UserProfile/UserAuthInfo/modals/RegisterEmailMFAModal/style.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
#register-mfa-email-modal {
44
.content {
55
padding: 30px 20px;
6+
67
@include media-breakpoint-up(lg) {
78
padding: 0 30px 30px;
89
}
9-
.message-box {
10-
margin-bottom: 25px;
10+
11+
.message-box-spacer {
12+
padding-bottom: 25px;
1113
}
14+
1215
form {
1316
padding: 0;
1417
}

‎web/src/pages/users/UserProfile/UserAuthInfo/modals/RegisterTOTPModal/style.scss

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
& > .content {
33
padding-bottom: 2.6rem;
44

5-
& > .message-box {
6-
min-height: 70px;
7-
margin-bottom: 2rem;
5+
& > .message-box-spacer {
6+
padding-bottom: 20px;
87

98
@include media-breakpoint-up(lg) {
10-
margin: 0 3rem 2.5rem;
11-
width: calc(100% - 6rem);
9+
padding: 0 30px 25px;
1210
}
1311

1412
p {

‎web/src/pages/users/shared/modals/AddApiTokenModal/components/AddApiTokenForm/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515

1616
.copy-generated-token-content {
17-
& > .message-box {
18-
margin-bottom: 25px;
17+
& > .message-box-spacer {
18+
padding-bottom: 25px;
1919
}
2020

2121
& > .expandable-card {

‎web/src/pages/wizard/components/WizardNetworkConfiguration/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
width: 100%;
1616
}
1717

18-
& > .message-box {
19-
margin-bottom: 25px;
18+
& > .message-box-spacer {
19+
padding-bottom: 25px;
2020
}
2121

2222
& > .form-checkbox {

‎web/src/pages/wizard/components/WizardNetworkImport/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
width: 100%;
1313
}
1414

15-
& > .message-box {
16-
margin-bottom: 25px;
15+
& > .message-box-spacer {
16+
padding-bottom: 25px;
1717
}
1818

1919
& > .upload {

‎web/src/shared/defguard-ui

0 commit comments

Comments
 (0)