Merge branch 'epic/campaigns' into refactor/default-form-GIVE-1949

impress-org · Nov 8, 2024 · a360628 · a360628
2 parents 27d8338 + f112d87
commit a360628
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/src/Campaigns/resources/admin/components/CampaignFormModal/CampaignFormModal.module.scss b/src/Campaigns/resources/admin/components/CampaignFormModal/CampaignFormModal.module.scss
@@ -14,7 +14,7 @@
     }
 
     .description {
-        font-size: 0.875rem;
+        font-size: 14px;
         margin-bottom: 0.4rem;
     }
 }
@@ -34,7 +34,7 @@
 
         cursor: pointer;
         border: 1px solid #9CA0AF;
-        border-radius: 1rem;
+        border-radius: 8px;
         padding: 0.75rem 1.5rem 0.75rem 1.5rem;
     }
 

diff --git a/src/Campaigns/resources/admin/components/CampaignFormModal/index.tsx b/src/Campaigns/resources/admin/components/CampaignFormModal/index.tsx
@@ -240,9 +240,9 @@ export default function CampaignFormModal({isOpen, handleClose, apiSettings, tit
                             <label htmlFor="title">
                                 {__("What's the title of your campaign?", 'give')} {requiredAsterisk}
                             </label>
-                            <span className={styles.description}>
+                            <div className={styles.description}>
                                 {__("Give your campaign a title that tells donors what it's about.", 'give')}
-                            </span>
+                            </div>
                             <input
                                 type="text"
                                 {...register('title', {required: __('The campaign must have a title!', 'give')})}
@@ -258,9 +258,9 @@ export default function CampaignFormModal({isOpen, handleClose, apiSettings, tit
                         </div>
                         <div className="givewp-campaigns__form-row">
                             <label htmlFor="shortDescription">{__("What's your campaign about?", 'give')}</label>
-                            <span className={styles.description}>
+                            <div className={styles.description}>
                                 {__('Let your donors know the story behind your campaign.', 'give')}
-                            </span>
+                            </div>
                             <textarea
                                 {...register('shortDescription')}
                                 rows={4}
@@ -272,9 +272,9 @@ export default function CampaignFormModal({isOpen, handleClose, apiSettings, tit
                         </div>
                         <div className="givewp-campaigns__form-row">
                             <label htmlFor="image">{__('Add a cover image or video for your campaign.', 'give')}</label>
-                            <span className={styles.description}>
+                            <div className={styles.description}>
                                 {__('Upload an image or video to represent and inspire your campaign.', 'give')}
-                            </span>
+                            </div>
                             <Upload
                                 id="givewp-campaigns-upload-cover-image"
                                 label={__('Cover', 'give')}

diff --git a/src/Campaigns/resources/admin/components/CampaignsListTable/index.tsx b/src/Campaigns/resources/admin/components/CampaignsListTable/index.tsx
@@ -31,7 +31,7 @@ const campaignStatus = [
     },
     {
         value: 'inactive',
-        text: __('Inactive', 'give'),
+        text: __('Archived', 'give'),
     },
     {
         value: 'draft',

diff --git a/src/Campaigns/resources/admin/components/CreateCampaignModal/index.tsx b/src/Campaigns/resources/admin/components/CreateCampaignModal/index.tsx
@@ -41,7 +41,7 @@ export default function CreateCampaignModal() {
 
     return (
         <>
-            <a className={`button button-primary ${styles.createCampaignButton}`} onClick={openModal}>
+            <a style={{borderRadius: '4px'}} className={`button button-primary ${styles.createCampaignButton}`} onClick={openModal}>
                 {__('Create campaign', 'give')}
             </a>
             <CampaignFormModal

diff --git a/src/Campaigns/resources/admin/components/FormModal/FormModal.module.scss b/src/Campaigns/resources/admin/components/FormModal/FormModal.module.scss
@@ -57,6 +57,13 @@
                     line-height: 1.5;
                     padding: var(--givewp-spacing-3) var(--givewp-spacing-5);
                     width: 100%;
+                    border-radius: 8px;
+
+                    &.button-secondary {
+                        color: #060c1a;
+                        border-color: #9ca0af;
+                        background-color: white;
+                    }
                 }
             }
 

diff --git a/src/Campaigns/resources/admin/components/Inputs/Upload/styles.scss b/src/Campaigns/resources/admin/components/Inputs/Upload/styles.scss
@@ -6,6 +6,7 @@ div.media-modal.wp-core-ui {
     text-align: center;
     padding: 1rem 0 0 0;
     border: 1px dotted;
+    border-radius: 4px;
 
     button {
         cursor: pointer;