From: Robin Appelman <robin@icewind.nl>
Date: Mon, 5 Dec 2016 13:20:54 +0000 (+0100)
Subject: fix conflict dialog styling in firefox
X-Git-Tag: v11.0RC2~43^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F2507%2Fhead;p=nextcloud-server.git

fix conflict dialog styling in firefox

Signed-off-by: Robin Appelman <robin@icewind.nl>
---

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'] {