diff options
| author | Jan-Philipp Litza <janphilipp@litza.de> | 2012-12-28 18:46:00 +0100 |
|---|---|---|
| committer | Jan-Philipp Litza <janphilipp@litza.de> | 2012-12-28 18:46:00 +0100 |
| commit | da14940813fc5a37add81733412cf6eed23a3fab (patch) | |
| tree | d97a992a8770adfc46c83096daefe2eec2fd2c8d | |
| parent | 01c9d1a810f293c6ec379b8ec8d3b1b1dabb6bd4 (diff) | |
| parent | b8fb31c6c5ee9f33c76d296cf72a095d78223117 (diff) | |
Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
| -rw-r--r-- | public/css/scrolltable.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/public/css/scrolltable.js b/public/css/scrolltable.js index 82224e31..1319495c 100644 --- a/public/css/scrolltable.js +++ b/public/css/scrolltable.js @@ -12,11 +12,7 @@ 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')); |