unify .original div to fix css in firefox, clear:left to fix filename wrapping in chrome, shrink width of columns and get rid of ie8 hack

This commit is contained in:
Jörn Friedrich Dreyer 2013-09-10 17:34:28 +02:00
parent cec932f292
commit 2c9b3d32ef
1 changed files with 4 additions and 7 deletions

View File

@ -348,7 +348,7 @@ table.dragshadow td.size {
margin-right: 3px; margin-right: 3px;
} }
.oc-dialog .fileexists th:first-child { .oc-dialog .fileexists th:first-child {
width: 235px; width: 230px;
} }
.oc-dialog .fileexists th label { .oc-dialog .fileexists th label {
font-weight: normal; font-weight: normal;
@ -367,6 +367,7 @@ table.dragshadow td.size {
.oc-dialog .fileexists .conflict .filename { .oc-dialog .fileexists .conflict .filename {
color:#777; color:#777;
word-break: break-all; word-break: break-all;
clear: left;
} }
.oc-dialog .fileexists .icon { .oc-dialog .fileexists .icon {
width: 64px; width: 64px;
@ -379,15 +380,11 @@ table.dragshadow td.size {
.oc-dialog .fileexists .replacement { .oc-dialog .fileexists .replacement {
float: left; float: left;
width: 235px; width: 230px;
} }
.oc-dialog .fileexists .original { .oc-dialog .fileexists .original {
float: left; float: left;
width: 235px; width: 230px;
}
html.lte9 .oc-dialog .fileexists .original {
float: left;
width: 225px;
} }
.oc-dialog .fileexists .conflicts { .oc-dialog .fileexists .conflicts {
overflow-y:scroll; overflow-y:scroll;