Skip to content

Commit b05a725

Browse files
committed
fix custom css - it works now
1 parent 3d91215 commit b05a725

File tree

8 files changed

+21
-9
lines changed

8 files changed

+21
-9
lines changed

makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ IMAGE := ${DOCKER_URL}/${OWNER}/scheduler/${NAME}:${VERSION}
1919

2020
.PHONY: all deps deploy docker-linux-amd64 docker-linux-arm
2121

22-
all: clean deps dist/${NAME}-linux-amd64
22+
all: clean deps dist/${NAME}-linux-amd64 dist/web-dist
2323

2424
deps:
2525
@go mod download

web/src/app/components/book-page/book-page.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<mat-toolbar class="availability-toolbar" [ngStyle]="{'background-color': status.unoccupied? '#74be06' : '#E94037'}">
1+
<mat-toolbar class="availability-toolbar"
2+
[ngStyle]="{'background-color': status.unoccupied? 'var(--room-available-color)' : 'var(--room-unavailable-color)'}">
23
<button mat-icon-button class="back-button" (click)="routeToMain()">
34
<mat-icon svgIcon="BackArrow" [inline]="true"></mat-icon>
45
</button>

web/src/app/components/book-page/book-page.component.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
.availability-toolbar {
2-
background-color: var(--room-available-color);
32
height: 55px;
43
color: var(--toolbar-text-color);
54
font-size: 28px;
65
font-style: oblique;
6+
font-family: var(--main-font);
77
}
88

99
.back-button {
1010
background-color: transparent;
1111
color: var(--toolbar-text-color);
1212
border: 2px solid var(--toolbar-text-color);
1313
padding: 0px;
14+
font-family: var(--button-font);
1415
}
1516

1617
.toolbar-spacing {
@@ -50,6 +51,7 @@ app-time {
5051
width: 100%;
5152
margin-top: 2%;
5253
margin-left: 2%;
54+
font-family: var(--main-font);
5355
}
5456

5557
.event-label {
@@ -87,12 +89,14 @@ app-time {
8789
padding: 10px;
8890
width: 39% !important;
8991
border-bottom: 1px solid var(--booking-select-color);
92+
font-family: var(--main-font);
9093
}
9194

9295
.select-end-time {
9396
padding: 10px;
9497
width: 39% !important;
9598
border-bottom: 1px solid var(--booking-select-color);
99+
font-family: var(--main-font);
96100
}
97101

98102
mat-option {

web/src/app/components/main-page/main-page.component.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
<mat-toolbar class="availability-toolbar" [ngStyle]="{'background-color': status.unoccupied? '#74be06' : '#E94037'}">
1+
<mat-toolbar class="availability-toolbar"
2+
[ngStyle]="{'background-color': status.unoccupied? 'var(--room-available-color)' : 'var(--room-unavailable-color)'}">
23
</mat-toolbar>
34

4-
<mat-grid-list cols="5" rowHeight="117.5px">
5+
<mat-grid-list cols="5" rowHeight="117.6px">
56
<mat-grid-tile colspan="3" rowspan="2" class="grid-tile-status">
67
<mat-card class="title-card">
78
<mat-card-title class="room-title">{{ status.roomName }}</mat-card-title>
8-
<mat-card-content class="room-availability" [ngStyle]="{'color': status.unoccupied? '#74be06' : '#E94037'}">
9+
<mat-card-content class="room-availability"
10+
[ngStyle]="{'color': status.unoccupied? 'var(--room-available-color)' : 'var(--room-unavailable-color)'}">
911
<span *ngIf="status.unoccupied; else elseBlock">AVAILABLE</span>
1012
<ng-template #elseBlock>IN USE</ng-template>
1113
</mat-card-content>

web/src/app/components/main-page/main-page.component.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.availability-toolbar {
22
height: 55px;
3+
font-family: var(--main-font);
34
}
45

56
.title-card {
@@ -8,6 +9,7 @@
89
padding: 10%;
910
margin-top: 15%;
1011
background-color: transparent;
12+
font-family: var(--main-font);
1113
}
1214

1315
.room-title {
@@ -16,7 +18,6 @@
1618
}
1719

1820
.room-availability {
19-
color: var(--room-available-color);
2021
font-size: 64px;
2122
}
2223

web/src/app/components/schedule-page/schedule-page.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<mat-toolbar class="availability-toolbar" [ngStyle]="{'background-color': status.unoccupied? '#74be06' : '#E94037'}">
1+
<mat-toolbar class="availability-toolbar"
2+
[ngStyle]="{'background-color': status.unoccupied? 'var(--room-available-color)' : 'var(--room-unavailable-color)'}">
23
<button mat-icon-button class="back-button" (click)="routeToMain()">
34
<mat-icon svgIcon="BackArrow" [inline]="true"></mat-icon>
45
</button>

web/src/app/components/schedule-page/schedule-page.component.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
.availability-toolbar {
2-
background-color: var(--room-available-color);
32
height: 55px;
43
color: var(--toolbar-text-color);
54
font-size: 28px;
65
font-style: oblique;
6+
font-family: var(--main-font);
77
}
88

99
.back-button {
1010
background-color: transparent;
1111
color: var(--toolbar-text-color);
1212
border: 2px solid var(--toolbar-text-color);
1313
padding: 0px;
14+
font-family: var(--button-font);
1415
}
1516

1617
.toolbar-spacing {
@@ -31,6 +32,7 @@ app-time {
3132
.empty-schedule-message {
3233
color: var(--empty-schedule-message-color);
3334
font-size: 24px;
35+
font-family: var(--main-font);
3436
text-align: center;
3537
padding-top: 35%;
3638
width: 100%;

web/src/app/components/time/time.component.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
box-sizing: border-box;
66
margin-top: 10%;
77
background-color: transparent;
8+
font-family: var(--main-font);
89
}
910

1011
.time-card-time {

0 commit comments

Comments
 (0)