Merge branch 'spidev' into 'master'

Kalender

See merge request fronk/thetool!798

public/css/pages/Calendar/View.css

@@ -185,9 +185,11 @@ thead .fc-day-today .fc-scrollgrid-sync-inner .fc-col-header-cell-cushion {
 .fc-day-today .fc-daygrid-day-number {
     color: #fff;
 }
+
 .fc-scroller-harness-liquid {
     overflow: visible;
 }
+
 .fc .fc-scroller-harness-liquid {
     height: 700px;
 }
@@ -348,7 +350,6 @@ thead .fc-day-today .fc-scrollgrid-sync-inner .fc-col-header-cell-cushion {
 }
 
 
-
 .fc-timegrid-event-short .fc-event-time::after {
     content: "";
 }
@@ -525,7 +526,7 @@ thead .fc-day-today .fc-scrollgrid-sync-inner .fc-col-header-cell-cushion {
 
 #calendar-side-div {
     max-height: 850px;
-    overflow: scroll;
+    overflow: auto;
 }
 
 /* width */
@@ -657,4 +658,16 @@ thead .fc-day-today .fc-scrollgrid-sync-inner .fc-col-header-cell-cushion {
 
 .modal-body .fa-lock:before {
     color: #0ab900;
+}
+
+.cal-group-name {
+    display: inline-block;
+    max-width: 170px;
+    margin-left: 10px;
+
+}
+
+.group-checkbox {
+    margin-left: -28px;
+    margin-top: 4px;
 }

public/js/pages/Calendar/View.js

@@ -1696,10 +1696,12 @@ Xinon GMbH`;
             $(this).removeClass('fa-square-arrow-up');
             $(this).addClass('fa-square-arrow-down');
             $(this).closest('.calendar-side-borders-sub').find('.calendar-side-borders-sub-inner').hide();
+            $(".color-input").eq(0).trigger("change", 1);
         } else {
             $(this).removeClass('fa-square-arrow-down');
             $(this).addClass('fa-square-arrow-up');
             $(this).closest('.calendar-side-borders-sub').find('.calendar-side-borders-sub-inner').show();
+            $(".color-input").eq(0).trigger("change", 1);
         }
     });