merged shift view fixes

3 files changed, 22 insertions, 0 deletions

diff --git a/public/css/base.css b/public/css/base.css
index cafd6de2..6b030319 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -112,6 +112,22 @@ table {
 	display: block;
 }
 
+#shifts {
+	background-color: #fff;
+}
+
+#shifts td.free {
+	background-color: #F6CECE;
+}
+
+#shifts td.occupied {
+	background-color: #BCF5A9;
+}
+
+#shifts td:not(.free):not(.occupied) {
+	border: 0;
+}
+
 table.scrollable {
 	max-width: 100%;
 	overflow-x: scroll;
@@ -170,6 +186,8 @@ fieldset p label input {
 
 th {
     background: #f0f0f0;
+}
+thead th {
     vertical-align: bottom;
 }
 
diff --git a/public/css/scrolltable.js b/public/css/scrolltable.js
index 1184207f..82224e31 100644
--- a/public/css/scrolltable.js
+++ b/public/css/scrolltable.js
@@ -12,7 +12,11 @@ function scrolltable(elem) {
 	elem.className = elem.className + ' scrollable';
 	var tbodywidth = widths.pop();
 	tbody.style.width = (tbodywidth + 16) + 'px';
+<<<<<<< HEAD
 	tbody.style.height = (window.innerHeight - 50) + 'px';
+=======
+	tbody.style.height = (window.innerHeight - 100) + 'px';
+>>>>>>> cc8f117ed128cf9b046f9835640b84362d151883
 	for(var i = 0; i < ths.length; i++) {
 		var paddingLeft = parseInt(window.getComputedStyle(ths[i], null).getPropertyValue('padding-left'));
 		var paddingRight = parseInt(window.getComputedStyle(ths[i], null).getPropertyValue('padding-right'));
diff --git a/public/pic/icons/lock.png b/public/pic/icons/lock.png
new file mode 100644
index 00000000..2ebc4f6f
--- /dev/null
+++ b/public/pic/icons/lock.png