Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion frontend/src/components/generic/Button/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ const variantStyles = (theme, props) => {
case 'applicationsClosed': {
return {
color: color.main,
padding: 0,
margin: '25px 0 0 0',
textTransform: 'uppercase',
fontSize: '18px',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ const colorLibStyle = props => ({
},
active: {
'& $line': {
borderColor: '#784af4',
borderColor: props => props.accent || '#784af4',
},
},
completed: {
'& $line': {
borderColor: '#784af4',
borderColor: props => props.accent || '#784af4',
},
},
line: {
Expand Down
24 changes: 23 additions & 1 deletion frontend/src/pages/_events/slug/default/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,30 @@ import FadeInWrapper from 'components/animated/FadeInWrapper'
import Container from 'components/generic/Container'
import { Helmet } from 'react-helmet'
import EventDetailContext from '../context'
import EventButtons from './EventButtons'

const useStyles = makeStyles({
header: {
background: props => props.headerBackgroundColor,
color: props => props.headerTextColor,

'& button:not(disabled)': {
color: props => props.headerBackgroundColor,
background: props => props.accentColor,

'&:hover': {
background: props => props.linkColor,
},
},
},
cta: {
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
padding: '3rem 2rem',
margin: '20px 0 0 0',
'& button': {
color: props => props.accentColor,
margin: 0,
},
},
body: {
Expand Down Expand Up @@ -179,6 +195,12 @@ export default () => {
</Grid>
</Container>
</Box>
<Box className={`${classes.header} ${classes.cta}`}>
<EventButtons
event={event}
registration={registration}
/>
</Box>
</StaggeredList>
</FadeInWrapper>
<BannerCarousel />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/_pricing/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default () => {
const { t } = useTranslation()
const body1 = [
'Event registration and organization through platform.',
'For non - profit organizations.'
'For non - profit organizations.',
]
const body2 = [
'Event registration and organization through platform',
Expand Down