iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

impossible merge fail

This commit is contained in:
Philip Häusler 2012-12-28 17:58:48 +01:00
parent f759296db3
commit b8fb31c6c5
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/scrolltable.js
View File

@ -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'));