summaryrefslogtreecommitdiff
path: root/public/css
diff options
context:
space:
mode:
Diffstat (limited to 'public/css')
-rw-r--r--public/css/base.css4
-rw-r--r--public/css/scrolltable.js4
2 files changed, 8 insertions, 0 deletions
diff --git a/public/css/base.css b/public/css/base.css
index 0f37c8f0..6b030319 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -90,6 +90,10 @@ nav {
padding: 10px;
}
+#content h2 {
+ margin-top: 20px;
+}
+
p {
padding: 0 0 10px 0;
}
diff --git a/public/css/scrolltable.js b/public/css/scrolltable.js
index 1319495c..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'));