From 8baead7b2ceb85e75b5248823db3a20b4f44f050 Mon Sep 17 00:00:00 2001
From: Timofey Boyko <fognir742@gmail.com>
Date: Thu, 26 May 2022 10:09:47 +0300
Subject: [PATCH] Fix Bug 57348 - Client.Files. fix layout for overwrite
 confirmation dialog

---
 .../dialogs/ConflictResolveDialog/index.js      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/products/ASC.Files/Client/src/components/dialogs/ConflictResolveDialog/index.js b/products/ASC.Files/Client/src/components/dialogs/ConflictResolveDialog/index.js
index 04462c265d..0b7db34143 100644
--- a/products/ASC.Files/Client/src/components/dialogs/ConflictResolveDialog/index.js
+++ b/products/ASC.Files/Client/src/components/dialogs/ConflictResolveDialog/index.js
@@ -19,14 +19,14 @@ const StyledModalDialog = styled(ModalDialog)`
   }
 
   .conflict-resolve-radio-button {
-    label{
+    label {
       display: flex;
       align-items: flex-start;
     }
     svg {
       overflow: visible;
       margin-right: 8px;
-      margin-top: 3px
+      margin-top: 3px;
     }
   }
 
@@ -40,14 +40,23 @@ const StyledModalDialog = styled(ModalDialog)`
   .button-dialog-accept {
     margin-right: 8px;
   }
-  .modal-dialog-aside-footer, .modal-dialog-modal-footer {
+
+  .modal-dialog-aside-footer {
     border-top: ${(props) => props.theme.button.border.baseDisabled};
     margin-left: -16px;
     margin-right: -16px;
     padding-left: 16px;
     padding-right: 16px;
     padding-top: 16px;
-}
+  }
+
+  .modal-dialog-modal-footer {
+    border-top: ${(props) => props.theme.button.border.baseDisabled};
+    margin-left: -12px;
+    margin-right: -12px;
+    padding-left: 12px;
+    padding-right: 12px;
+    padding-top: 12px;
   }
 `;