Browse Source

Fix colors.

pull/744/head
Sebastian 4 years ago
parent
commit
1da7fbc3f0
  1. 8
      frontend/app/features/content/pages/calendar/calendar-page.component.scss
  2. 12
      frontend/app/features/content/pages/calendar/calendar-page.component.ts
  3. 4
      frontend/app/framework/angular/forms/editors/date-time-editor.component.html
  4. 2
      frontend/app/framework/angular/forms/editors/date-time-editor.component.scss

8
frontend/app/features/content/pages/calendar/calendar-page.component.scss

@ -2,6 +2,14 @@
.tui-full-calendar-weekday-schedule-bullet {
top: 10px !important;
}
.tui-full-calendar-time-schedule {
min-height: 22px;
}
.tui-full-calendar-time-schedule-content {
min-height: 22px !important;
}
}
.calendar {

12
frontend/app/features/content/pages/calendar/calendar-page.component.ts

@ -74,6 +74,15 @@ export class CalendarPageComponent implements AfterViewInit, OnDestroy {
this.changeDetector.detectChanges();
});
this.calendar.on('clickDayname', (event: any) => {
if (this.calendar.getViewName() === 'day') {
this.calendar.setDate(new Date(event.date));
this.calendar.changeView('day', true);
this.load();
}
});
this.load();
});
}
@ -122,8 +131,9 @@ export class CalendarPageComponent implements AfterViewInit, OnDestroy {
this.calendar.clear();
this.calendar.createSchedules(contents.items.map(x => ({
id: x.id,
bgColor: '#fff',
borderColor: x.scheduleJob!.color,
color: x.scheduleJob?.color,
color: 'x.scheduleJob?.color',
calendarId: '1',
category: 'time',
end: x.scheduleJob?.dueTime.toISOString(),

4
frontend/app/framework/angular/forms/editors/date-time-editor.component.html

@ -1,5 +1,5 @@
<div (sqxResizeCondition)="setCompact($event)" [sqxResizeMinWidth]="500" [sqxResizeMaxWidth]="0">
<div class="form-inline">
<div class="d-flex" (sqxResizeCondition)="setCompact($event)" [sqxResizeMinWidth]="500" [sqxResizeMaxWidth]="0">
<div class="d-flex">
<div class="form-group me-1">
<div *ngIf="!isCompact && isDateTimeMode && shouldShowDateTimeModeButton">
<button type="button" class="btn btn-text-secondary btn-sm btn-time-mode" (click)="setLocalMode(false)" *ngIf="snapshot.isLocal">

2
frontend/app/framework/angular/forms/editors/date-time-editor.component.scss

@ -5,6 +5,7 @@
.input-group {
.form-control {
&:last-child {
padding-left: .75rem;
padding-right: 2rem;
position: relative;
}
@ -20,6 +21,7 @@
.form-date-time-only {
padding-left: 3.3rem;
padding-right: .75rem;
width: 11rem;
}

Loading…
Cancel
Save