From eec1eff65b8298037eae7bb25112dd98a766836a Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sun, 20 Oct 2019 14:54:00 +0200 Subject: [PATCH] Shifts overview: Style cleanup --- includes/view/ShiftCalendarShiftRenderer.php | 9 ++++----- resources/assets/themes/base.less | 18 +++--------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/includes/view/ShiftCalendarShiftRenderer.php b/includes/view/ShiftCalendarShiftRenderer.php index 2589b0cf..4911979f 100644 --- a/includes/view/ShiftCalendarShiftRenderer.php +++ b/includes/view/ShiftCalendarShiftRenderer.php @@ -38,11 +38,11 @@ class ShiftCalendarShiftRenderer return [ $blocks, - div( 'panel-' . $class. ' shift-card" style="height: ' + div('shift-card" style="height: ' . ($blocks * ShiftCalendarRenderer::BLOCK_HEIGHT - ShiftCalendarRenderer::MARGIN) . 'px;', div( - 'shift panel panel-' . $class. '" style="position: absolute; width:100%;', + 'shift panel panel-' . $class, [ $this->renderShiftHead($shift, $class), div('panel-body', [ @@ -52,11 +52,10 @@ class ShiftCalendarShiftRenderer 'Name' => $shift['room_name'] ]) ]), - $shifts_row, - div('shift-spacer') + $shifts_row ] ) - ) + ) ]; } diff --git a/resources/assets/themes/base.less b/resources/assets/themes/base.less index cf0df683..74dadc11 100644 --- a/resources/assets/themes/base.less +++ b/resources/assets/themes/base.less @@ -196,27 +196,15 @@ table a > .icon-icon_angel { z-index: 0; overflow: hidden; position: relative; + margin: 0 5px 5px 0; &:hover { overflow: visible; z-index: 100; - border: none; - - .shift { - z-index: 100; - } } - } - .shift { - margin: 0 5px 5px 0; - position: absolute; - width: 100%; - - &:hover { - margin: 0 5px 5px 0; - position: absolute; - width: 100%; + .shift { + min-height: 100%; } } }