diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js index 1a4cf0bab..2702d4757 100644 --- a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js +++ b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js @@ -44,6 +44,7 @@ // Component is private ' ', ' ', + '
place {{block.component.c_location}}
', ' ', ' ', '' diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js index 8a23fc75b..5619c0d6e 100644 --- a/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js +++ b/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js @@ -25,7 +25,7 @@ replace: true, template: [ '
', - ' {{ block.starthour }} - ', + ' {{ block.starthour }} - ', ' {{ block.component.summary }}', ' ', // Component is reccurent diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss index aa57830dc..98492231c 100644 --- a/UI/WebServerResources/scss/views/SchedulerUI.scss +++ b/UI/WebServerResources/scss/views/SchedulerUI.scss @@ -200,24 +200,15 @@ $block_margin: 2%; // See sgCalendarDayBlock.directive.js position: relative; } - // The outer event container - .sg-event { - font-size: $sg-font-size-2; - &, md-icon { - //color: #fff !important; // Overwrite dynamic CSS theme - } - .material-icons { - font-size: $sg-font-size-2; - } - } - // Events from editable calendars are draggable .sg-draggable-calendar-block, .sg-event--ghost { cursor: move; } + // The outer event container .sg-event { + font-size: $sg-font-size-2; border-radius: 3px; position: absolute; left: 0; @@ -255,6 +246,14 @@ $block_margin: 2%; // See sgCalendarDayBlock.directive.js overflow: hidden; } + .material-icons { + font-size: $sg-font-size-2; + } + + .secondary { // location in days view, hours in month view + font-weight: $sg-font-light; + } + // Event DnD drag grips &:hover { @@ -413,9 +412,6 @@ $block_margin: 2%; // See sgCalendarDayBlock.directive.js margin: $block_margin; text-overflow: ellipsis; white-space: nowrap; - span { // hours - font-weight: $sg-font-light; - } } }