Merge pull request #274 from engelsystem/task-164-shift-view

Task 164 shift view

1 files changed, 33 insertions, 25 deletions

diff --git a/public/css/theme2.css b/public/css/theme2.css
index e73daad3..7646f08b 100644
--- a/public/css/theme2.css
+++ b/public/css/theme2.css
@@ -6730,38 +6730,46 @@ body {
 .footer a {
   color: #777777;
 }
-#shifts td.free {
-  border: 1px solid #7f528b;
-  background-color: #f1eaf2;
-}
-a#shifts td.free:hover,
-a#shifts td.free:focus {
-  background-color: #dbcadf;
+.shift-calendar {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-itmes: stretch;
+  width: 100%;
 }
-#shifts td.occupied {
-  border: 1px solid #7b9c41;
-  background-color: #f0f5e7;
+.shift-calendar .lane {
+  background: #f9f9f9;
+  min-width: 300px;
+  width: 300px;
+  flex-grow: 1;
 }
-a#shifts td.occupied:hover,
-a#shifts td.occupied:focus {
-  background-color: #d9e6c3;
+.shift-calendar .lane .header {
+  background: #fff;
+  height: 30px;
+  padding: 5px;
 }
-#shifts td.collides {
-  border: 1px solid #e3a14d;
-  background-color: #ffffff;
+.shift-calendar .lane .tick {
+  height: 30px;
+  border-top: 1px solid #f4f4f4;
 }
-a#shifts td.collides:hover,
-a#shifts td.collides:focus {
-  background-color: #e6e6e6;
+.shift-calendar .lane .tick.hour {
+  border-top: 2px solid #dddddd;
+  font-size: 0.9em;
+  padding-left: 5px;
 }
-#shifts td.own {
-  border: 1px solid #777777;
+.shift-calendar .lane .tick.day {
+  border-top: 2px solid #758499;
+  font-size: 0.9em;
+  padding-left: 5px;
 }
-.row-day {
-  border-top: 2px solid #777777;
+.shift-calendar .lane.time {
+  min-width: 100px;
+  width: 100px;
+  flex-grow: 0;
 }
-.row-header {
-  min-width: 90px;
+.shift-calendar .shift {
+  margin: 0 5px 5px 0;
+  overflow: hidden;
 }
 .space-top {
   margin-top: 15px;