From af9b3e3889080e006e34406e18c142d38122d50d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 5 Dec 2016 14:20:54 +0100 Subject: [PATCH] fix conflict dialog styling in firefox Signed-off-by: Robin Appelman --- apps/files/css/upload.css | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css index abc09c3e99c..6f337a27578 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.css @@ -118,7 +118,7 @@ margin-right: 3px; } .oc-dialog .fileexists th:first-child { - width: 230px; + width: 225px; } .oc-dialog .fileexists th label { font-weight: normal; @@ -147,16 +147,14 @@ background-size: 64px 64px; float: left; } + +.oc-dialog .fileexists .original, .oc-dialog .fileexists .replacement { float: left; - width: 230px; -} -.oc-dialog .fileexists .original { - float: left; - width: 230px; + width: 225px; } .oc-dialog .fileexists .conflicts { - overflow-y:scroll; + overflow-y: auto; max-height: 225px; } .oc-dialog .fileexists .conflict input[type='checkbox'] { -- 2.39.5