chore: modal animations

packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/NoteConflictResolutionModal.tsx

@@ -165,10 +165,7 @@ const NoteConflictResolutionModal = ({
   return (
     <Modal
       title="Resolve conflicts"
-      className={{
-        content: 'md:h-full md:w-[70vw]',
-        description: 'flex flex-col overflow-x-hidden md:flex-row',
-      }}
+      className="flex flex-col overflow-x-hidden md:flex-row"
       actions={actions}
       close={close}
       customFooter={

packages/web/src/javascripts/Components/NoteView/NoteView.tsx

@@ -1031,7 +1031,11 @@ class NoteView extends AbstractComponent<NoteViewProps, State> {
           </div>
         </div>
 
-        <ModalOverlay isOpen={this.state.showConflictResolutionModal} close={this.toggleConflictResolutionModal}>
+        <ModalOverlay
+          isOpen={this.state.showConflictResolutionModal}
+          close={this.toggleConflictResolutionModal}
+          className="md:h-full md:w-[70vw]"
+        >
           <NoteConflictResolutionModal
             currentNote={this.note}
             conflictedNotes={this.state.conflictedNotes}