Styles improvements, fixes

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2022-11-29 22:49:35 +01:00
parent e5ff4fa176
commit 5d9925ed5f
3 changed files with 9 additions and 7 deletions

View file

@ -385,7 +385,7 @@ const Status: React.FC<IStatus> = (props) => {
)} )}
{actualStatus.event ? <EventPreview className='shadow-xl' status={actualStatus} /> : ( {actualStatus.event ? <EventPreview className='shadow-xl' status={actualStatus} /> : (
<> <Stack space={4}>
<StatusContent <StatusContent
status={actualStatus} status={actualStatus}
onClick={handleClick} onClick={handleClick}
@ -408,7 +408,7 @@ const Status: React.FC<IStatus> = (props) => {
{quote} {quote}
</Stack> </Stack>
)} )}
</> </Stack>
)} )}
</Stack> </Stack>

View file

@ -3,6 +3,7 @@ import React from 'react';
import { defineMessages, useIntl } from 'react-intl'; import { defineMessages, useIntl } from 'react-intl';
import Button from '../button/button'; import Button from '../button/button';
import HStack from '../hstack/hstack';
import IconButton from '../icon-button/icon-button'; import IconButton from '../icon-button/icon-button';
import Stack from '../stack/stack'; import Stack from '../stack/stack';
@ -115,7 +116,7 @@ const Modal: React.FC<IModal> = ({
</div> </div>
{confirmationAction && ( {confirmationAction && (
<div className='mt-5 flex flex-row justify-between' data-testid='modal-actions'> <HStack className='mt-5' justifyContent='between' data-testid='modal-actions'>
<div className='flex-grow'> <div className='flex-grow'>
{cancelAction && ( {cancelAction && (
<Button <Button
@ -127,7 +128,7 @@ const Modal: React.FC<IModal> = ({
)} )}
</div> </div>
<Stack space={2}> <HStack space={2}>
{secondaryAction && ( {secondaryAction && (
<Button <Button
theme='secondary' theme='secondary'
@ -146,8 +147,8 @@ const Modal: React.FC<IModal> = ({
> >
{confirmationText} {confirmationText}
</Button> </Button>
</Stack> </HStack>
</div> </HStack>
)} )}
</div> </div>
); );

View file

@ -326,6 +326,7 @@ const EventHeader: React.FC<IEventHeader> = ({ status }) => {
}; };
const handleParticipantsClick: React.MouseEventHandler = e => { const handleParticipantsClick: React.MouseEventHandler = e => {
e.preventDefault();
e.stopPropagation(); e.stopPropagation();
dispatch(openModal('EVENT_PARTICIPANTS', { dispatch(openModal('EVENT_PARTICIPANTS', {
@ -404,7 +405,7 @@ const EventHeader: React.FC<IEventHeader> = ({ status }) => {
defaultMessage='Organized by {name}' defaultMessage='Organized by {name}'
values={{ values={{
name: ( name: (
<Link className='mention' to={`/@${account.acct}`}> <Link className='mention inline-block' to={`/@${account.acct}`}>
<HStack space={1} alignItems='center' grow> <HStack space={1} alignItems='center' grow>
<span dangerouslySetInnerHTML={{ __html: account.display_name_html }} /> <span dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
{account.verified && <VerificationBadge />} {account.verified && <VerificationBadge />}