From f604232f3a5745368a9f8513b954603302949f60 Mon Sep 17 00:00:00 2001 From: Zyc Date: Sat, 26 Nov 2022 16:49:20 +1100 Subject: fix multiline-format-error in file-conflict modal when multiple files have conflicts, a scrollbar is shown in the file-conflict modal. due to the scrollbar the width of original/existing is to large, so that instead of being next to each other they flow into the next line. this change fixes this Signed-off-by: Zyc --- apps/files/css/upload.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/css/upload.scss b/apps/files/css/upload.scss index 3706bb5323f..88207e0a844 100644 --- a/apps/files/css/upload.scss +++ b/apps/files/css/upload.scss @@ -156,7 +156,7 @@ .oc-dialog .fileexists .original, .oc-dialog .fileexists .replacement { float: left; - width: 225px; + width: 50%; } .oc-dialog .fileexists .conflicts { overflow-y: auto; -- cgit v1.2.3 From b58b50874c4d5c52b1b29e86c6987fe6f068117c Mon Sep 17 00:00:00 2001 From: Zyc Date: Sat, 3 Dec 2022 03:26:15 +0000 Subject: add build css files Signed-off-by: Zyc --- apps/files/css/merged.css | 2 +- apps/files/css/upload.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files/css/merged.css b/apps/files/css/merged.css index a46cf1cd722..3b595813654 100644 --- a/apps/files/css/merged.css +++ b/apps/files/css/merged.css @@ -1541,7 +1541,7 @@ table.dragshadow td.size { .oc-dialog .fileexists .original, .oc-dialog .fileexists .replacement { float: left; - width: 225px; + width: 50%; } .oc-dialog .fileexists .conflicts { diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css index 1ab561b2156..efe99b4129f 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.css @@ -187,7 +187,7 @@ .oc-dialog .fileexists .original, .oc-dialog .fileexists .replacement { float: left; - width: 225px; + width: 50%; } .oc-dialog .fileexists .conflicts { -- cgit v1.2.3