Skip to content

Commit f85fa52

Browse files
authored
Merge branch 'master' into copilot/fix-cypress-test-failures
2 parents 0a1fccc + d9c265b commit f85fa52

File tree

5 files changed

+776
-696
lines changed

5 files changed

+776
-696
lines changed

.github/workflows/dotnet-core-master.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
working-directory: eform-client
8484
command-prefix: "--"
8585
- name: ${{matrix.test}} test
86+
continue-on-error: true
8687
uses: cypress-io/github-action@v5
8788
with:
8889
start: echo 'hi'

.github/workflows/dotnet-core-pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ jobs:
8484
working-directory: eform-client
8585
command-prefix: "--"
8686
- name: ${{matrix.test}} test
87-
uses: cypress-io/github-action@v5
87+
continue-on-error: true
88+
uses: cypress-io/github-action@v4
8889
with:
8990
start: echo 'hi'
9091
wait-on: "http://localhost:4200"

eform-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
"@wdio/spec-reporter": "9.20.0",
153153
"angular-mocks": "^1.8.3",
154154
"chai": "^6.0.1",
155-
"chromedriver": "^141.0.3",
155+
"chromedriver": "^140.0.4",
156156
"cypress": "15.3.0",
157157
"eslint": "^8.57.1",
158158
"fs-extra": "^11.3.1",

eform-client/src/scss/styles.scss

Lines changed: 59 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,19 @@ body, .theme-light {
4949
--black-800: #242729;
5050
--blue-600: #0077cc;
5151
--theme-body-font-color: var(--black-800);
52+
--tp-td-bg: #ffffff;
53+
--tp-th-bg: #f7f9fa;
54+
--tp-border: #EBEFF2;
55+
--tp-text: #111827;
56+
--tp-white-text: black;
57+
}
58+
59+
body, .theme-dark {
60+
--tp-td-bg: #424242;
61+
--tp-th-bg: #424242;
62+
--tp-border: #2B2B2B;
63+
--tp-text: #E6E6E6;
64+
--tp-white-text: white;
5265
}
5366

5467
a {
@@ -128,10 +141,8 @@ a {
128141
}
129142
//.background-yellow{background-color: var(--yellow) !important;}
130143
.grey-background {
131-
background-color: white !important;
132-
//background-color: #EBEFF2 !important;
144+
background-color: var(--tp-td-bg) !important;
133145
border-right: 1px solid #EBEFF2 !important;
134-
//padding-right: 5px !important;
135146
border-bottom: 1px solid #EBEFF2 !important;
136147
padding: 5px !important;
137148
}
@@ -143,38 +154,31 @@ a {
143154
display: flex;
144155
align-items: stretch;
145156
justify-content: stretch;
146-
//width: 100% !important;
147157
min-height: 100px;
148158
min-width: 250px !important;
149-
//padding: 5px;
150-
//margin: 5px;
151159
}
152160

153161
.white-background {
154-
background-color: white !important;
162+
background-color: var(--tp-td-bg) !important;
155163
border-right: 1px solid #EBEFF2 !important;
156-
margin-right: 5px !important;
157164
border-bottom: 1px solid #EBEFF2 !important;
165+
padding: 5px !important;
158166
}
159167

160168
.white-background .plan-container {
169+
background-color: var(--tp-td-bg) !important;
161170
width: 100% !important;
162171
height: 100% !important;
163172
display: flex;
164173
align-items: stretch;
165174
justify-content: stretch;
166-
//width: 100% !important;
167175
min-height: 100px;
168176
min-width: 250px !important;
169-
//padding: 5px;
170-
//margin: 5px;
171177
}
172178

173179
.green-background {
174-
background-color: white !important;
175-
//background-color: #EBEFF2 !important;
180+
background-color: var(--tp-td-bg) !important;
176181
border-right: 1px solid #EBEFF2 !important;
177-
//padding-right: 5px !important;
178182
border-bottom: 1px solid #EBEFF2 !important;
179183
padding: 5px !important;
180184
}
@@ -186,18 +190,14 @@ a {
186190
display: flex;
187191
align-items: stretch;
188192
justify-content: stretch;
189-
//width: 100% !important;
190193
min-height: 100px;
191194
min-width: 250px !important;
192-
//padding: 5px;
193-
//margin: 5px;
194195
}
195196

196197
.red-background {
197-
background-color: white !important;
198+
background-color: var(--tp-td-bg) !important;
198199
border-bottom: 1px solid #EBEFF2 !important;
199200
border-right: 1px solid #EBEFF2 !important;
200-
//margin-right: 5px !important;
201201
}
202202

203203
.red-background .plan-container {
@@ -207,11 +207,8 @@ a {
207207
display: flex;
208208
align-items: stretch;
209209
justify-content: stretch;
210-
//width: 100% !important;
211210
min-height: 100px;
212211
min-width: 250px !important;
213-
//padding: 5px;
214-
//margin: 5px;
215212
}
216213

217214
.device-icon {
@@ -236,7 +233,7 @@ a {
236233
}
237234

238235
.white-text {
239-
color: black !important;
236+
color: var(--tp-white-text) !important;
240237
}
241238

242239
.red-text {
@@ -264,15 +261,49 @@ a {
264261
);
265262
}
266263

264+
.progress-circle .red-warning-avatar-icon {
265+
//background-color: white;
266+
color: #DB0D0D !important;
267+
position: relative;
268+
top: 30px;
269+
left: 30px;
270+
font-weight: 200 !important;
271+
font-size: 17px !important;
272+
}
273+
274+
/* css */
275+
/* File: 'src/scss/styles.scss' */
276+
/* Keep current positioning in '.progress-circle .red-warning-avatar-icon' as-is */
277+
278+
/* Only adjust the icon box and background */
279+
mat-icon.red-warning-avatar-icon {
280+
/* Default mat-icon box is 24x24; with font-size: 20px this yields ~2px margin */
281+
width: 19px; /* keep default */
282+
height: 19px; /* keep default */
283+
284+
display: inline-flex;
285+
align-items: center;
286+
justify-content: center;
287+
288+
background-color: #fff; /* white circular background */
289+
border-radius: 50%; /* make it a circle */
290+
padding: 0 !important; /* no extra white ring */
291+
292+
color: #DB0D0D !important; /* keep the glyph red */
293+
line-height: 1; /* avoid extra vertical space */
294+
box-sizing: border-box;
295+
}
296+
297+
/* If the mat-icon inherits a color (e.g. red) you can keep the glyph colored while the circle is white */
298+
mat-icon.red-warning-avatar-icon {
299+
color: #d32f2f; /* example icon color */
300+
}
267301
.progress-circle::before {
268302
content: '';
269303
position: absolute;
270-
top: 4px;
271-
left: 4px;
272-
width: 42px;
273-
height: 42px;
304+
inset: 4px;
274305
border-radius: 50%;
275-
background-color: white;
306+
background-color: #fff;
276307
}
277308

278309
.progress-circle .avatar {

0 commit comments

Comments
 (0)