From 6358a96aeb60cd010452ec988f3b99a070f74754 Mon Sep 17 00:00:00 2001
From: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>
Date: Mon, 21 Feb 2022 11:36:13 +0000
Subject: [PATCH] Align new shared folder design with other modals (#1955)

* align right

* lingui extract

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com>
---
 .../Modules/FileBrowsers/ShareModal.tsx       | 33 +++++++------------
 packages/files-ui/src/locales/de/messages.po  |  6 ----
 packages/files-ui/src/locales/en/messages.po  |  6 ----
 packages/files-ui/src/locales/es/messages.po  |  6 ----
 packages/files-ui/src/locales/fr/messages.po  |  6 ----
 packages/files-ui/src/locales/no/messages.po  |  6 ----
 6 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/ShareModal.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/ShareModal.tsx
index 60c255ee9f..4361700925 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/ShareModal.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/ShareModal.tsx
@@ -43,19 +43,15 @@ const useStyles = makeStyles(
         flexDirection: "column"
       },
       checkboxContainer: {
-        display: "flex",
-        justifyContent: "center",
         marginTop: constants.generalUnit * 4
       },
       buttonsContainer: {
         display: "flex",
-        flexDirection: "column",
-        alignItems: "center",
-        marginTop: constants.generalUnit * 2
+        marginTop: constants.generalUnit * 2,
+        justifyContent: "flex-end"
       },
       mainButton: {
-        width: 240,
-        marginBottom: constants.generalUnit * 0.5
+        marginLeft: constants.generalUnit
       },
       cancelButton: {
         maxWidth: 100
@@ -89,7 +85,7 @@ const useStyles = makeStyles(
       },
       modalFlexItem: {
         width: "100%",
-        marginBottom: constants.generalUnit * 2
+        marginBottom: constants.generalUnit
       },
       newFolderInput: {
         margin: 0,
@@ -348,9 +344,15 @@ const ShareModal = ({ onClose, fileSystemItems }: IShareModalProps) => {
               </div>
             )}
             <div className={classes.buttonsContainer}>
+              <Button
+                variant="outline"
+                onClick={onClose}
+                className={classes.cancelButton}
+              >
+                <Trans>Cancel</Trans>
+              </Button>
               <Button
                 type="submit"
-                size="large"
                 variant="primary"
                 onClick={handleShare}
                 className={classes.mainButton}
@@ -360,22 +362,11 @@ const ShareModal = ({ onClose, fileSystemItems }: IShareModalProps) => {
                   : !sharedFolderName || !!nameError
                 }
               >
-                {isUsingExistingBucket ? keepOriginalFile
+                {keepOriginalFile
                   ? <Trans>Copy over</Trans>
                   : <Trans>Move over</Trans>
-                  : keepOriginalFile
-                    ? <Trans>Create folder &amp; Copy over</Trans>
-                    : <Trans>Create folder &amp; Move over</Trans>
                 }
               </Button>
-              <Button
-                size="large"
-                variant="text"
-                onClick={onClose}
-                className={classes.cancelButton}
-              >
-                <Trans>Close</Trans>
-              </Button>
             </div>
           </div>
         </div>
diff --git a/packages/files-ui/src/locales/de/messages.po b/packages/files-ui/src/locales/de/messages.po
index 39db01a587..c5d26c0d88 100644
--- a/packages/files-ui/src/locales/de/messages.po
+++ b/packages/files-ui/src/locales/de/messages.po
@@ -253,12 +253,6 @@ msgstr ""
 msgid "Create a new shared folder"
 msgstr ""
 
-msgid "Create folder & Copy over"
-msgstr ""
-
-msgid "Create folder & Move over"
-msgstr ""
-
 msgid "Create your public username in <0>Settings</0>!"
 msgstr ""
 
diff --git a/packages/files-ui/src/locales/en/messages.po b/packages/files-ui/src/locales/en/messages.po
index 21effd4454..9f0aac9bf4 100644
--- a/packages/files-ui/src/locales/en/messages.po
+++ b/packages/files-ui/src/locales/en/messages.po
@@ -253,12 +253,6 @@ msgstr "Create Shared Folder"
 msgid "Create a new shared folder"
 msgstr "Create a new shared folder"
 
-msgid "Create folder & Copy over"
-msgstr "Create folder & Copy over"
-
-msgid "Create folder & Move over"
-msgstr "Create folder & Move over"
-
 msgid "Create your public username in <0>Settings</0>!"
 msgstr "Create your public username in <0>Settings</0>!"
 
diff --git a/packages/files-ui/src/locales/es/messages.po b/packages/files-ui/src/locales/es/messages.po
index a1ff91b0cc..37b53ea632 100644
--- a/packages/files-ui/src/locales/es/messages.po
+++ b/packages/files-ui/src/locales/es/messages.po
@@ -254,12 +254,6 @@ msgstr ""
 msgid "Create a new shared folder"
 msgstr ""
 
-msgid "Create folder & Copy over"
-msgstr ""
-
-msgid "Create folder & Move over"
-msgstr ""
-
 msgid "Create your public username in <0>Settings</0>!"
 msgstr ""
 
diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po
index 6ba532eaae..5847a6b3eb 100644
--- a/packages/files-ui/src/locales/fr/messages.po
+++ b/packages/files-ui/src/locales/fr/messages.po
@@ -254,12 +254,6 @@ msgstr "Créer un dossier partagé"
 msgid "Create a new shared folder"
 msgstr "Créer un nouveau dossier partagé"
 
-msgid "Create folder & Copy over"
-msgstr "Créer un dossier et le copier"
-
-msgid "Create folder & Move over"
-msgstr "Créer un dossier et le déplacer"
-
 msgid "Create your public username in <0>Settings</0>!"
 msgstr "Créez votre nom d'utilisateur public dans <0>Paramètres</0> !"
 
diff --git a/packages/files-ui/src/locales/no/messages.po b/packages/files-ui/src/locales/no/messages.po
index 439d8c4717..f185c9aaaf 100644
--- a/packages/files-ui/src/locales/no/messages.po
+++ b/packages/files-ui/src/locales/no/messages.po
@@ -253,12 +253,6 @@ msgstr ""
 msgid "Create a new shared folder"
 msgstr ""
 
-msgid "Create folder & Copy over"
-msgstr ""
-
-msgid "Create folder & Move over"
-msgstr ""
-
 msgid "Create your public username in <0>Settings</0>!"
 msgstr ""