summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2012-12-28 15:13:28 +0100
committerPhilip Häusler <msquare@notrademark.de>2012-12-28 15:13:28 +0100
commitc5438d5228887e638208f347fa132bfd5b60dacb (patch)
tree1bbf815d28e71eedf5c0280f87b64cd4f535372e /public
parente61cb06ee83cda639663d093644097ea790f2fc2 (diff)
parentcc8f117ed128cf9b046f9835640b84362d151883 (diff)
merged shift view fixes
Diffstat (limited to 'public')
-rw-r--r--public/css/base.css18
-rw-r--r--public/css/scrolltable.js4
-rw-r--r--public/pic/icons/lock.pngbin0 -> 749 bytes
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
Binary files differ