Skip to content

Commit b368bb8

Browse files
lwjxytomsun28
andauthored
[improve] update login page and status page color (apache#1977)
Co-authored-by: tomsun28 <[email protected]>
1 parent de0de1c commit b368bb8

File tree

3 files changed

+21
-10
lines changed

3 files changed

+21
-10
lines changed

web-app/src/app/routes/status-public/status-public.component.html

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -194,19 +194,18 @@
194194
</nz-list>
195195
</div>
196196
<ng-template #incidentHeader>
197-
<div style="width: 100%; border: 1px dotted gray; border-radius: 3px">
197+
<div
198+
style="width: 100%; border: 2px solid gray; border-radius: 3px"
199+
[ngStyle]="{ borderColor: getStatusBorderColor(incident.state) }"
200+
>
198201
<div style="margin: 10px; display: flex; justify-content: space-between">
199202
<div style="font-weight: bold; font-size: large">
200-
<span *ngIf="incident.state == 0" style="color: #ff2f2f">{{ incident.name }}</span>
201-
<span *ngIf="incident.state == 1" style="color: #e56c23">{{ incident.name }}</span>
202-
<span *ngIf="incident.state == 2" style="color: #19a7e7">{{ incident.name }}</span>
203-
<span *ngIf="incident.state == 3" style="color: #34be8f">{{ incident.name }}</span>
203+
<span>{{ incident.name }}</span>
204204
</div>
205205
<div style="font-weight: bold">
206-
<span *ngIf="incident.state == 0" style="color: #ff2f2f">{{ 'status.incident.state.' + incident.state | i18n }}</span>
207-
<span *ngIf="incident.state == 1" style="color: #e56c23">{{ 'status.incident.state.' + incident.state | i18n }}</span>
208-
<span *ngIf="incident.state == 2" style="color: #19a7e7">{{ 'status.incident.state.' + incident.state | i18n }}</span>
209-
<span *ngIf="incident.state == 3" style="color: #34be8f">{{ 'status.incident.state.' + incident.state | i18n }}</span>
206+
<span [ngStyle]="{ color: getStatusBorderColor(incident.state) }">{{
207+
'status.incident.state.' + incident.state | i18n
208+
}}</span>
210209
</div>
211210
</div>
212211
<div style="margin-left: 10px; margin-top: 10px; margin-bottom: 10px; display: flex; font-size: medium">

web-app/src/app/routes/status-public/status-public.component.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,5 +164,17 @@ export class StatusPublicComponent implements OnInit {
164164
return processTime;
165165
}
166166

167+
getStatusBorderColor(status: number): string {
168+
if (status === 0) {
169+
return '#ff2f2f';
170+
} else if (status === 1) {
171+
return '#e56c23';
172+
} else if (status === 2) {
173+
return '#19a7e7';
174+
} else {
175+
return '#34be8f';
176+
}
177+
}
178+
167179
protected readonly Array = Array;
168180
}

web-app/src/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<base href="/">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<link rel="icon" type="image/x-icon" href="favicon.ico">
9-
<style type="text/css">.preloader{position:fixed;top:0;left:0;width:100%;height:100%;overflow:hidden;background:#49a9ee;z-index:9999;transition:opacity .65s}.preloader-hidden-add{opacity:1;display:block}.preloader-hidden-add-active{opacity:0}.preloader-hidden{display:none}.cs-loader{position:absolute;top:0;left:0;height:100%;width:100%}.cs-loader-inner{transform:translateY(-50%);top:50%;position:absolute;width:100%;color:#fff;text-align:center}.cs-loader-inner label{font-size:20px;opacity:0;display:inline-block}@keyframes lol{0%{opacity:0;transform:translateX(-300px)}33%{opacity:1;transform:translateX(0)}66%{opacity:1;transform:translateX(0)}100%{opacity:0;transform:translateX(300px)}}.cs-loader-inner label:nth-child(6){animation:lol 3s infinite ease-in-out}.cs-loader-inner label:nth-child(5){animation:lol 3s .1s infinite ease-in-out}.cs-loader-inner label:nth-child(4){animation:lol 3s .2s infinite ease-in-out}.cs-loader-inner label:nth-child(3){animation:lol 3s .3s infinite ease-in-out}.cs-loader-inner label:nth-child(2){animation:lol 3s .4s infinite ease-in-out}.cs-loader-inner label:nth-child(1){animation:lol 3s .5s infinite ease-in-out}</style>
9+
<style type="text/css">.preloader{position:fixed;top:0;left:0;width:100%;height:100%;overflow:hidden;background:#c192c7;z-index:9999;transition:opacity .65s}.preloader-hidden-add{opacity:1;display:block}.preloader-hidden-add-active{opacity:0}.preloader-hidden{display:none}.cs-loader{position:absolute;top:0;left:0;height:100%;width:100%}.cs-loader-inner{transform:translateY(-50%);top:50%;position:absolute;width:100%;color:#fff;text-align:center}.cs-loader-inner label{font-size:20px;opacity:0;display:inline-block}@keyframes lol{0%{opacity:0;transform:translateX(-300px)}33%{opacity:1;transform:translateX(0)}66%{opacity:1;transform:translateX(0)}100%{opacity:0;transform:translateX(300px)}}.cs-loader-inner label:nth-child(6){animation:lol 3s infinite ease-in-out}.cs-loader-inner label:nth-child(5){animation:lol 3s .1s infinite ease-in-out}.cs-loader-inner label:nth-child(4){animation:lol 3s .2s infinite ease-in-out}.cs-loader-inner label:nth-child(3){animation:lol 3s .3s infinite ease-in-out}.cs-loader-inner label:nth-child(2){animation:lol 3s .4s infinite ease-in-out}.cs-loader-inner label:nth-child(1){animation:lol 3s .5s infinite ease-in-out}</style>
1010
<!-- Google tag (gtag.js) -->
1111
<script async src="https://www.googletagmanager.com/gtag/js?id=G-13PPZZ7P4Y"></script>
1212
<script>

0 commit comments

Comments
 (0)