Merge pull request #4798 from urbit/mp/landscape/action-bg

landscape: pass background colors to actions
This commit is contained in:
matildepark 2021-04-21 14:38:39 -04:00 committed by GitHub
commit 1a01e58b7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -92,6 +92,7 @@ export default function NotificationsScreen(props: any): ReactElement {
<StatelessAsyncAction <StatelessAsyncAction
overflow="hidden" overflow="hidden"
color="black" color="black"
backgroundColor="white"
onClick={onReadAll} onClick={onReadAll}
> >
Mark All Read Mark All Read
@ -106,7 +107,7 @@ export default function NotificationsScreen(props: any): ReactElement {
{!view && <Inbox {!view && <Inbox
pendingJoin={pendingJoin} pendingJoin={pendingJoin}
{...props} {...props}
filter={filter.groups} filter={filter.groups}
/>} />}
</Col> </Col>
</Body> </Body>

View File

@ -73,14 +73,14 @@ export function Note(props: NoteProps & RouteComponentProps) {
if (window.ship === note?.post?.author) { if (window.ship === note?.post?.author) {
adminLinks.push( adminLinks.push(
<Link to={`${baseUrl}/edit`}> <Link to={`${baseUrl}/edit`}>
<Action>Update</Action> <Action backgroundColor="white">Update</Action>
</Link> </Link>
) )
}; };
if (window.ship === note?.post?.author || ourRole === "admin") { if (window.ship === note?.post?.author || ourRole === "admin") {
adminLinks.push( adminLinks.push(
<Action destructive onClick={deletePost}> <Action backgroundColor="white" destructive onClick={deletePost}>
Delete Delete
</Action> </Action>
) )