summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2019-10-20 15:45:30 +0200
committerGitHub <noreply@github.com>2019-10-20 15:45:30 +0200
commit4e65e6f73ae13d5d833e37f5a841c375cdde9530 (patch)
tree39a553f9f59513cb5f64cd91483aca2417782049
parentc09c94f3eaf84c610e28d7b8dcc8c52b155b9bd6 (diff)
parenteec1eff65b8298037eae7bb25112dd98a766836a (diff)
Merge pull request #665 from matschundbrei/expand-shift-panel
Expand shift panel
-rw-r--r--includes/view/ShiftCalendarShiftRenderer.php9
-rw-r--r--resources/assets/themes/base.less20
2 files changed, 7 insertions, 22 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 254f5a09..74dadc11 100644
--- a/resources/assets/themes/base.less
+++ b/resources/assets/themes/base.less
@@ -196,29 +196,15 @@ table a > .icon-icon_angel {
z-index: 0;
overflow: hidden;
position: relative;
- border-bottom-width: 1px;
- border-bottom-style: dashed;
+ 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%;
}
}
}