Skip to content

Commit

Permalink
Merge branch 'f/implement-multiprocess' into d/erc-paritary
Browse files Browse the repository at this point in the history
  • Loading branch information
selankon committed Nov 13, 2024
2 parents e809a24 + 70cbe70 commit 3cbe8e0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
10 changes: 6 additions & 4 deletions src/components/Process/Chained.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ const VoteButtonContainer = ({ children }: PropsWithChildren) => {
left={0}
bgColor='process.aside.aside_footer_mbl_border'
pt={1}
display={{ base: 'block', lg2: 'none' }}
display={isBreakPoint ? 'block' : 'none'}
>
{children}
</Box>
)
}
return (
<Box position='sticky' bottom={0} left={0} pb={1} pt={1} display={{ base: 'none', lg2: 'block' }}>
<Box position='sticky' bottom={0} left={0} pb={1} pt={1} display={isBreakPoint ? 'none' : 'block'}>
{children}
</Box>
)
Expand Down Expand Up @@ -197,8 +197,10 @@ const ChainedProcessesWrapper = () => {
</ElectionProvider>
)}
<VoteButtonContainer>
{!connected && election.get('census.type') === 'spreadsheet' && <SpreadsheetAccess />}
{isBlindCsp && !connected && <BlindCSPConnect />}
<Flex justifyContent='center' alignItems='center' direction={'column'} py={3} px={{ base: 3, lg2: 0 }}>
{!connected && election.get('census.type') === 'spreadsheet' && <SpreadsheetAccess />}
{isBlindCsp && !connected && <BlindCSPConnect />}
</Flex>
</VoteButtonContainer>
</Box>
)
Expand Down
2 changes: 2 additions & 0 deletions src/theme/components/Questions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ const baseStyle = definePartsStyle({
alertTitle: {
fontSize: 'lg',
mb: 3,
whiteSpace: 'normal',
overflowWrap: 'break-word',
},

alertDescription: {
Expand Down
5 changes: 4 additions & 1 deletion src/theme/components/SpreadSheet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ const { defineMultiStyleConfig, definePartsStyle } = createMultiStyleConfigHelpe

const baseStyle = definePartsStyle({
button: {
w: '100%',
w: '60%',
borderRadius: 30,
color: 'process.spreadsheet.color',
mb: 4,
py: 3,
height: '50px',
},

disconnect: {
Expand Down

2 comments on commit 3cbe8e0

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.