diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-12-05 15:19:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 15:19:02 +0100 |
| commit | b1b4de32b8b646625a605d07e71b915828f1766c (patch) | |
| tree | 4d097e82bdfda93211334e70f488b0246d7f63e2 | |
| parent | 8adf61772676bfe71e338fc1c009359135eb381e (diff) | |
| parent | af9b3e3889080e006e34406e18c142d38122d50d (diff) | |
| download | nextcloud-server-b1b4de32b8b646625a605d07e71b915828f1766c.tar.gz nextcloud-server-b1b4de32b8b646625a605d07e71b915828f1766c.zip | |
Merge pull request #2507 from nextcloud/conflict-dialog-ff
fix conflict dialog styling in firefox
| -rw-r--r-- | apps/files/css/upload.css | 12 |
1 files 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'] { |