Skip to content

Commit d1fbecf

Browse files
committed
Fixing table styling.
1 parent a435584 commit d1fbecf

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-table/time-plannings-table.component.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
<ng-container *ngIf="Date.parse(row.planningPrDayModels[col.field]?.date) < Date.now()">
244244
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 !== 0 || row.planningPrDayModels[col.field]?.planHours !== 0 || row.planningPrDayModels[col.field]?.start1StartedAt !== null">
245245
<div class="{{ getCellTextColor(row, col.field) }}">
246-
<strong id="totalBreakTime{{index}}_{{col.field}}" [matTooltip]="'Total breaktime' | translate "><mat-icon class="neutral-icon">pause</mat-icon>{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.pauseMinutes) }}</strong>
246+
<span id="totalBreakTime{{index}}_{{col.field}}" [matTooltip]="'Total breaktime' | translate "><mat-icon class="neutral-icon">pause</mat-icon>{{ convertMinutesToTime(row.planningPrDayModels[col.field]?.pauseMinutes) }}</span>
247247
</div>
248248
</div>
249249
</ng-container>
@@ -252,14 +252,14 @@
252252
<ng-container *ngIf="!row.planningPrDayModels[col.field]?.nettoHoursOverrideActive">
253253
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 !== 0 || row.planningPrDayModels[col.field]?.planHours !== 0 || row.planningPrDayModels[col.field]?.start1StartedAt !== null">
254254
<div class="{{ getCellTextColor(row, col.field) }}">
255-
<strong id="totalWorkingHours{{index}}_{{col.field}}" [matTooltip]="'Total working hours' | translate "><mat-icon class="neutral-icon">schedule</mat-icon>{{ row.planningPrDayModels[col.field]?.actualHours.toFixed(2) }}</strong>
255+
<span id="totalWorkingHours{{index}}_{{col.field}}" [matTooltip]="'Total working hours' | translate "><mat-icon class="neutral-icon">schedule</mat-icon>{{ row.planningPrDayModels[col.field]?.actualHours.toFixed(2) }}</span>
256256
</div>
257257
</div>
258258
</ng-container>
259259
<ng-container *ngIf="row.planningPrDayModels[col.field]?.nettoHoursOverrideActive">
260260
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.nettoHoursOverride !== 0">
261261
<div class="{{ getCellTextColor(row, col.field) }}">
262-
<strong id="totalWorkingHours{{index}}_{{col.field}}" [matTooltip]="'NettoHours override' | translate "><mat-icon class="neutral-icon">schedule</mat-icon>{{ row.planningPrDayModels[col.field]?.nettoHoursOverride.toFixed(2) }}</strong>
262+
<span id="totalWorkingHours{{index}}_{{col.field}}" [matTooltip]="'NettoHours override' | translate "><mat-icon class="neutral-icon">schedule</mat-icon>{{ row.planningPrDayModels[col.field]?.nettoHoursOverride.toFixed(2) }}</span>
263263
</div>
264264
</div>
265265
</ng-container>
@@ -268,15 +268,15 @@
268268
<ng-container *ngIf="Date.parse(row.planningPrDayModels[col.field]?.date) < Date.now()">
269269
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.paidOutFlex !== 0">
270270
<div class="{{ getCellTextColor(row, col.field) }}">
271-
<strong id="flexBalanceToDate{{index}}_{{col.field}}" [matTooltip]="'PaidOutFlex' | translate "><mat-icon class="neutral-icon">payments</mat-icon>{{ row.planningPrDayModels[col.field]?.paidOutFlex }}</strong>
271+
<span id="flexBalanceToDate{{index}}_{{col.field}}" [matTooltip]="'PaidOutFlex' | translate "><mat-icon class="neutral-icon">payments</mat-icon>{{ row.planningPrDayModels[col.field]?.paidOutFlex }}</span>
272272
</div>
273273
</div>
274274
</ng-container>
275275

276276
<ng-container *ngIf="Date.parse(row.planningPrDayModels[col.field]?.date) < Date.now()">
277277
<div class="plan-text" *ngIf="row.planningPrDayModels[col.field]?.plannedStartOfShift1 !== 0 || row.planningPrDayModels[col.field]?.planHours !== 0 || row.planningPrDayModels[col.field]?.start1StartedAt !== null">
278278
<div class="{{ getCellTextColor(row, col.field) }}">
279-
<strong id="flexBalanceToDate{{index}}_{{col.field}}" [matTooltip]="'Flex balance to date' | translate "><mat-icon class="neutral-icon">swap_vert</mat-icon>{{ row.planningPrDayModels[col.field]?.sumFlexEnd.toFixed(2) }}</strong>
279+
<span id="flexBalanceToDate{{index}}_{{col.field}}" [matTooltip]="'Flex balance to date' | translate "><mat-icon class="neutral-icon">swap_vert</mat-icon>{{ row.planningPrDayModels[col.field]?.sumFlexEnd.toFixed(2) }}</span>
280280
</div>
281281
</div>
282282
</ng-container>

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-table/time-plannings-table.component.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,10 @@
2828
}
2929

3030
.time-dashboard table tr th {
31-
background-color: #EBEFF2 !important;
31+
background-color: #f7f9fa !important;
32+
font-size: 14px;
33+
font-weight: 500;
34+
border-right: 1px solid #EBEFF2;
35+
border-top: 1px solid #EBEFF2;
36+
border-left: 1px solid #EBEFF2;
3237
}

0 commit comments

Comments
 (0)