diff options
| author | Philip Häusler <msquare@notrademark.de> | 2012-12-28 15:13:28 +0100 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2012-12-28 15:13:28 +0100 |
| commit | c5438d5228887e638208f347fa132bfd5b60dacb (patch) | |
| tree | 1bbf815d28e71eedf5c0280f87b64cd4f535372e /public/css/scrolltable.js | |
| parent | e61cb06ee83cda639663d093644097ea790f2fc2 (diff) | |
| parent | cc8f117ed128cf9b046f9835640b84362d151883 (diff) | |
merged shift view fixes
Diffstat (limited to 'public/css/scrolltable.js')
| -rw-r--r-- | public/css/scrolltable.js | 4 |
1 files changed, 4 insertions, 0 deletions
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')); |