diff options
| author | Simon L <szaimen@e.mail.de> | 2022-12-03 19:10:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-03 19:10:17 +0100 |
| commit | 8a1ce0f994f01590387552fd27a6d587927f0d38 (patch) | |
| tree | 77f31d9270955ce2cc07991feab2ffee42de1573 | |
| parent | 23f336761e2c3603ffb2e4785019329415a92a64 (diff) | |
| parent | b58b50874c4d5c52b1b29e86c6987fe6f068117c (diff) | |
| download | nextcloud-server-8a1ce0f994f01590387552fd27a6d587927f0d38.tar.gz nextcloud-server-8a1ce0f994f01590387552fd27a6d587927f0d38.zip | |
Merge pull request #35442 from Zyclotrop-j/patch-1
fix multiline-format-error in file-conflict modal
| -rw-r--r-- | apps/files/css/merged.css | 2 | ||||
| -rw-r--r-- | apps/files/css/upload.css | 2 | ||||
| -rw-r--r-- | apps/files/css/upload.scss | 2 |
3 files changed, 3 insertions, 3 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 { 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; |