iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #665 from matschundbrei/expand-shift-panel 

Expand shift panel
This commit is contained in:
Igor Scheller 2019-10-20 15:45:30 +02:00 committed by GitHub
parent c09c94f3ea eec1eff65b
commit 4e65e6f73a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
includes/view/ShiftCalendarShiftRenderer.php
View File

@ -38,11 +38,11 @@ class ShiftCalendarShiftRenderer
return [ return [
$blocks, $blocks,
div( 'panel-' . $class. ' shift-card" style="height: ' div('shift-card" style="height: '
. ($blocks * ShiftCalendarRenderer::BLOCK_HEIGHT - ShiftCalendarRenderer::MARGIN) . ($blocks * ShiftCalendarRenderer::BLOCK_HEIGHT - ShiftCalendarRenderer::MARGIN)
. 'px;', . 'px;',
div( div(
'shift panel panel-' . $class. '" style="position: absolute; width:100%;', 'shift panel panel-' . $class,
[ [
$this->renderShiftHead($shift, $class), $this->renderShiftHead($shift, $class),
div('panel-body', [ div('panel-body', [
@ -52,8 +52,7 @@ class ShiftCalendarShiftRenderer
'Name' => $shift['room_name'] 'Name' => $shift['room_name']
]) ])
]), ]),
$shifts_row, $shifts_row
div('shift-spacer')
] ]
) )
) )

18
resources/assets/themes/base.less
View File

@ -196,29 +196,15 @@ table a > .icon-icon_angel {
z-index: 0; z-index: 0;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
border-bottom-width: 1px; margin: 0 5px 5px 0;
border-bottom-style: dashed;
&:hover { &:hover {
overflow: visible; overflow: visible;
z-index: 100; z-index: 100;
border: none;
.shift {
z-index: 100;
}
}
} }
.shift { .shift {
margin: 0 5px 5px 0; min-height: 100%;
position: absolute;
width: 100%;
&:hover {
margin: 0 5px 5px 0;
position: absolute;
width: 100%;
} }
} }
} }