bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into chats

Browse source
This commit is contained in:
Chewbacca 2022-10-27 10:25:46 -04:00
commit da1d8c7e97
2 changed files with 3 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/soapbox/features/ui/components/actions_modal.tsx
View file

@ -37,10 +37,10 @@ const ActionsModal: React.FC<IActionsModal> = ({ status, actions, onClick, onClo
{...compProps} {...compProps}
rel='noopener' rel='noopener'
data-index={i} data-index={i}
className={classNames({ active, destructive })} className={classNames('w-full', { active, destructive })}
data-method={isLogout ? 'delete' : null} data-method={isLogout ? 'delete' : null}
> >
{icon && <Icon title={text} src={icon} role='presentation' tabIndex={-1} />} {icon && <Icon className='min-w-fit' title={text} src={icon} role='presentation' tabIndex={-1} />}
<div> <div>
<div className={classNames({ 'actions-modal__item-label': !!meta })}>{text}</div> <div className={classNames({ 'actions-modal__item-label': !!meta })}>{text}</div>
<div>{meta}</div> <div>{meta}</div>

29
app/styles/components/modal.scss
View file

@ -285,7 +285,7 @@
} }
.actions-modal { .actions-modal {
@apply w-full max-h-full max-w-lg mt-auto mb-2 bg-white dark:bg-gray-800; @apply w-full max-h-full max-w-lg m-auto mb-2 bg-white dark:bg-gray-800;
.status { .status {
overflow-y: auto; overflow-y: auto;
@ -386,30 +386,3 @@
width: 330px !important; width: 330px !important;
} }
} }
.column-inline-form {
padding: 7px 15px;
padding-right: 5px;
display: flex;
justify-content: flex-start;
align-items: center;
background: var(--brand-color--faint);
label {
flex: 1 1 auto;
input {
width: 100%;
margin-bottom: 6px;
&:focus {
outline: 0;
}
}
}
.icon-button {
flex: 0 0 auto;
margin: 0 5px;
}
}