diff options
| author | Philip Häusler <msquare@notrademark.de> | 2012-12-28 17:58:48 +0100 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2012-12-28 17:58:48 +0100 |
| commit | b8fb31c6c5ee9f33c76d296cf72a095d78223117 (patch) | |
| tree | fb3984dcd536e56f9781ea5a1f5b9f7a82dafe9f /public | |
| parent | f759296db3277abb6416349e6c5de15a7db6bbcc (diff) | |
impossible merge fail
Diffstat (limited to 'public')
| -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')); |