From 2c9b3d32efa466b655a7f24c5022a42045ef482f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de> Date: Tue, 10 Sep 2013 17:34:28 +0200 Subject: [PATCH] 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 --- apps/files/css/files.css | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index e503674e0f..06088b30ff 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -348,7 +348,7 @@ table.dragshadow td.size { margin-right: 3px; } .oc-dialog .fileexists th:first-child { - width: 235px; + width: 230px; } .oc-dialog .fileexists th label { font-weight: normal; @@ -367,6 +367,7 @@ table.dragshadow td.size { .oc-dialog .fileexists .conflict .filename { color:#777; word-break: break-all; + clear: left; } .oc-dialog .fileexists .icon { width: 64px; @@ -379,15 +380,11 @@ table.dragshadow td.size { .oc-dialog .fileexists .replacement { float: left; - width: 235px; + width: 230px; } .oc-dialog .fileexists .original { float: left; - width: 235px; -} -html.lte9 .oc-dialog .fileexists .original { - float: left; - width: 225px; + width: 230px; } .oc-dialog .fileexists .conflicts { overflow-y:scroll; -- GitLab