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

Revert progress bar styles #1313

Merged
merged 2 commits into from
Feb 1, 2023
Merged

Revert progress bar styles #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a407a0
Revert progress bar styles
ani-kalpachka Feb 1, 2023
e0b7fa9
Fix build issue
ani-kalpachka Feb 1, 2023
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
2 changes: 1 addition & 1 deletion src/common/util/money.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const moneyPublic = (
if (currency === 'USD') {
return `${amount} $`
}
return `${amount} лева`
return `${amount} лв.`
}
return new Intl.NumberFormat(i18n.language, {
style: 'currency',
Expand Down
17 changes: 1 addition & 16 deletions src/components/campaigns/InlineDonation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import LinkButton from '../common/LinkButton'
import CampaignProgress from './CampaignProgress'
import DonorsAndDonations from './DonorsAndDonations'
import CustomListItem from 'components/admin/navigation/CustomListItem'
import ExternalLink from 'components/common/ExternalLink'
import { socialMedia } from './helpers/socialMedia'
import { CampaignState } from './helpers/campaign.enums'
import { AlertStore } from 'stores/AlertStore'
Expand All @@ -46,7 +45,6 @@ const classes = {
donateButton: `${PREFIX}-donateButton`,
noCommissionInfo: `${PREFIX}-noCommissionInfo`,
infoIcon: `${PREFIX}-infoIcon`,
progressBar: `${PREFIX}-progressBar`,
campaignInfoWrapper: `${PREFIX}-campaignInfoWrapper`,
campaignInfoKey: `${PREFIX}-campaignInfoKey`,
campaignInfoValue: `${PREFIX}-campaignInfoValue`,
Expand Down Expand Up @@ -161,19 +159,6 @@ const StyledGrid = styled(Grid)(({ theme }) => ({
color: '#6d6d6d',
},

[`& .${classes.progressBar}`]: {
'.CampaignProgress-root': {
background: '#c6ced9',
borderRadius: theme.spacing(6),
boxShadow: 'inset 0px 0px 0px 1px #b8b8b8',

'& span': {
borderRadius: theme.spacing(6),
backgroundColor: 'rgba(40, 78, 132, 0.5)',
},
},
},

[`& .${classes.campaignInfoWrapper}`]: {
display: 'flex',
gap: theme.spacing(1.7),
Expand Down Expand Up @@ -276,7 +261,7 @@ export default function InlineDonation({ campaign }: Props) {
{moneyPublic(target, currency)}
</Typography>
</Grid>
<Grid className={classes.progressBar}>
<Grid>
<CampaignProgress campaignId={campaignId} raised={reached} target={target} />
</Grid>
<Grid container gap={2} className={classes.buttonContainer}>
Expand Down