Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update campaign design implementation #7613

Merged
merged 8 commits into from
Nov 8, 2024
Merged

Update campaign design implementation #7613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ee90e4
style: Add 4px border radius to button
kjohnson Nov 6, 2024
be8b4b1
style: Set description font size to 14px
kjohnson Nov 6, 2024
2a5da0d
style: Add 4px border radius to upload drop area
kjohnson Nov 6, 2024
d2c303c
style: Set 8px border radius to goal type option
kjohnson Nov 6, 2024
becd8c9
styles: Update modal button styles
kjohnson Nov 6, 2024
d969f83
chore: Update inactive status to read "Archived"
kjohnson Nov 7, 2024
4777057
Merge branch 'epic/campaigns' into refactor/campaigns-design-review-G…
kjohnson Nov 7, 2024
f57154e
Merge branch 'refactor/campaigns-design-review-GIVE-1343' of github.c…
kjohnson Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Campaigns/resources/admin/components/CampaignFormModal/CampaignFormModal.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

.description {
font-size: 0.875rem;
font-size: 14px;
margin-bottom: 0.4rem;
}
}
Expand All @@ -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;
}

Expand Down
12 changes: 6 additions & 6 deletions src/Campaigns/resources/admin/components/CampaignFormModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')})}
Expand All @@ -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}
Expand All @@ -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')}
Expand Down
2 changes: 1 addition & 1 deletion src/Campaigns/resources/admin/components/CampaignsListTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const campaignStatus = [
},
{
value: 'inactive',
text: __('Inactive', 'give'),
text: __('Archived', 'give'),
},
{
value: 'draft',
Expand Down
2 changes: 1 addition & 1 deletion src/Campaigns/resources/admin/components/CreateCampaignModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions src/Campaigns/resources/admin/components/FormModal/FormModal.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}

Expand Down
1 change: 1 addition & 0 deletions src/Campaigns/resources/admin/components/Inputs/Upload/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading