improve shift rendering

4 files changed, 40 insertions, 92 deletions

diff --git a/public/css/theme0.css b/public/css/theme0.css
index 49f928e9..cb46b82c 100644
--- a/public/css/theme0.css
+++ b/public/css/theme0.css
@@ -6730,32 +6730,19 @@ body {
 .footer a {
   color: #777777;
 }
-#shifts td.free {
-  border: 1px solid #d9534f;
-  background-color: #f2dede;
-}
-a#shifts td.free:hover,
-a#shifts td.free:focus {
-  background-color: #e4b9b9;
-}
-#shifts td.occupied {
-  border: 1px solid #5cb85c;
-  background-color: #dff0d8;
+#shifts.table td,
+#shifts.table th {
+  background-color: #f0f0f0;
 }
-a#shifts td.occupied:hover,
-a#shifts td.occupied:focus {
-  background-color: #c1e2b3;
-}
-#shifts td.collides {
-  border: 1px solid #f0ad4e;
-  background-color: #fcf8e3;
+#shifts.table .row-hour {
+  border-top-color: #777777;
 }
-a#shifts td.collides:hover,
-a#shifts td.collides:focus {
-  background-color: #f7ecb5;
+#shifts.table td.shift {
+  height: 1px;
+  padding: 0px 5px 5px 0px;
 }
-#shifts td.own {
-  border: 1px solid #777777;
+#shifts.table td.shift .panel {
+  margin-bottom: 0px;
 }
 .row-day {
   border-top: 2px solid #777777;
diff --git a/public/css/theme1.css b/public/css/theme1.css
index 379f53e4..916d303a 100644
--- a/public/css/theme1.css
+++ b/public/css/theme1.css
@@ -6753,32 +6753,19 @@ body {
 .footer a {
   color: #888888;
 }
-#shifts td.free {
-  border: 1px solid #d9534f;
-  background-color: #d9534f;
-}
-a#shifts td.free:hover,
-a#shifts td.free:focus {
-  background-color: #c9302c;
-}
-#shifts td.occupied {
-  border: 1px solid #5cb85c;
-  background-color: #5cb85c;
+#shifts.table td,
+#shifts.table th {
+  background-color: #f0f0f0;
 }
-a#shifts td.occupied:hover,
-a#shifts td.occupied:focus {
-  background-color: #449d44;
-}
-#shifts td.collides {
-  border: 1px solid #f0ad4e;
-  background-color: #f0ad4e;
+#shifts.table .row-hour {
+  border-top-color: #888888;
 }
-a#shifts td.collides:hover,
-a#shifts td.collides:focus {
-  background-color: #ec971f;
+#shifts.table td.shift {
+  height: 1px;
+  padding: 0px 5px 5px 0px;
 }
-#shifts td.own {
-  border: 1px solid #888888;
+#shifts.table td.shift .panel {
+  margin-bottom: 0px;
 }
 .row-day {
   border-top: 2px solid #888888;
diff --git a/public/css/theme2.css b/public/css/theme2.css
index e73daad3..5bc90f5f 100644
--- a/public/css/theme2.css
+++ b/public/css/theme2.css
@@ -6730,32 +6730,19 @@ 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;
-}
-#shifts td.occupied {
-  border: 1px solid #7b9c41;
-  background-color: #f0f5e7;
+#shifts.table td,
+#shifts.table th {
+  background-color: #f0f0f0;
 }
-a#shifts td.occupied:hover,
-a#shifts td.occupied:focus {
-  background-color: #d9e6c3;
-}
-#shifts td.collides {
-  border: 1px solid #e3a14d;
-  background-color: #ffffff;
+#shifts.table .row-hour {
+  border-top-color: #777777;
 }
-a#shifts td.collides:hover,
-a#shifts td.collides:focus {
-  background-color: #e6e6e6;
+#shifts.table td.shift {
+  height: 1px;
+  padding: 0px 5px 5px 0px;
 }
-#shifts td.own {
-  border: 1px solid #777777;
+#shifts.table td.shift .panel {
+  margin-bottom: 0px;
 }
 .row-day {
   border-top: 2px solid #777777;
diff --git a/public/css/theme3.css b/public/css/theme3.css
index 82228db5..15c2c68d 100644
--- a/public/css/theme3.css
+++ b/public/css/theme3.css
@@ -6739,32 +6739,19 @@ body {
 .footer a {
   color: #777777;
 }
-#shifts td.free {
-  border: 1px solid #da1639;
-  background-color: #f9c3cd;
-}
-a#shifts td.free:hover,
-a#shifts td.free:focus {
-  background-color: #f495a6;
-}
-#shifts td.occupied {
-  border: 1px solid #39ab50;
-  background-color: #c4eccc;
+#shifts.table td,
+#shifts.table th {
+  background-color: #f0f0f0;
 }
-a#shifts td.occupied:hover,
-a#shifts td.occupied:focus {
-  background-color: #9edfab;
-}
-#shifts td.collides {
-  border: 1px solid #dad216;
-  background-color: #f9f7c3;
+#shifts.table .row-hour {
+  border-top-color: #777777;
 }
-a#shifts td.collides:hover,
-a#shifts td.collides:focus {
-  background-color: #f4f095;
+#shifts.table td.shift {
+  height: 1px;
+  padding: 0px 5px 5px 0px;
 }
-#shifts td.own {
-  border: 1px solid #777777;
+#shifts.table td.shift .panel {
+  margin-bottom: 0px;
 }
 .row-day {
   border-top: 2px solid #777777;