diff options
| author | Zyc <Zyclotrop-j@users.noreply.github.com> | 2022-11-26 16:49:20 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-26 16:49:20 +1100 |
| commit | f604232f3a5745368a9f8513b954603302949f60 (patch) | |
| tree | 3498271d53c0f804065d54e4014b7e30ac4f4d4b /apps/files/css | |
| parent | 60c0027cda73ea58a4b6c28653e75cc06e2c8bdb (diff) | |
| download | nextcloud-server-f604232f3a5745368a9f8513b954603302949f60.tar.gz nextcloud-server-f604232f3a5745368a9f8513b954603302949f60.zip | |
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 <Zyclotrop-j@users.noreply.github.com>
Diffstat (limited to 'apps/files/css')
| -rw-r--r-- | apps/files/css/upload.scss | 2 |
1 files changed, 1 insertions, 1 deletions
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; |