From 1da7fbc3f0be4ca1eb81186dfaf2451590a7e236 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Tue, 3 Aug 2021 15:08:29 +0200
Subject: [PATCH] Fix colors.

---
 .../pages/calendar/calendar-page.component.scss      |  8 ++++++++
 .../pages/calendar/calendar-page.component.ts        | 12 +++++++++++-
 .../forms/editors/date-time-editor.component.html    |  4 ++--
 .../forms/editors/date-time-editor.component.scss    |  2 ++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/frontend/app/features/content/pages/calendar/calendar-page.component.scss b/frontend/app/features/content/pages/calendar/calendar-page.component.scss
index 6f18bd92a..3e24e47ee 100644
--- a/frontend/app/features/content/pages/calendar/calendar-page.component.scss
+++ b/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 {
diff --git a/frontend/app/features/content/pages/calendar/calendar-page.component.ts b/frontend/app/features/content/pages/calendar/calendar-page.component.ts
index 6f5899a16..cc4ced108 100644
--- a/frontend/app/features/content/pages/calendar/calendar-page.component.ts
+++ b/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(),
diff --git a/frontend/app/framework/angular/forms/editors/date-time-editor.component.html b/frontend/app/framework/angular/forms/editors/date-time-editor.component.html
index 7fb231577..f9eebcf6a 100644
--- a/frontend/app/framework/angular/forms/editors/date-time-editor.component.html
+++ b/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">
diff --git a/frontend/app/framework/angular/forms/editors/date-time-editor.component.scss b/frontend/app/framework/angular/forms/editors/date-time-editor.component.scss
index cf6238d89..43b8b12a5 100644
--- a/frontend/app/framework/angular/forms/editors/date-time-editor.component.scss
+++ b/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;
     }