1
1
mirror of https://github.com/urbit/shrub.git synced 2024-12-26 05:23:35 +03:00

Merge pull request from urbit/mp/launch/1-7-tweak-fix

launch: fix modal backgrounds
This commit is contained in:
matildepark 2021-02-24 17:33:15 -05:00 committed by GitHub
commit 2878cc9ad7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
pkg/interface/src/views/apps/launch

View File

@ -48,12 +48,12 @@ export default function LaunchApp(props) {
position={["relative", "absolute"]}
left="0"
bottom="0"
bg="#f2f2f2"
backgroundColor="white"
ml={3}
mb={3}
borderRadius={2}
overflow='hidden'
fontSize={0}
p={2}
cursor="pointer"
onClick={() => {
writeText(props.baseHash);
@ -63,7 +63,9 @@ export default function LaunchApp(props) {
}, 2000);
}}
>
<Text mono bold>{hashText || props.baseHash}</Text>
<Box backgroundColor="washedGray" p={2}>
<Text mono bold>{hashText || props.baseHash}</Text>
</Box>
</Box>
);
@ -181,7 +183,7 @@ export default function LaunchApp(props) {
<ModalButton
icon="Plus"
bg="washedGray"
color="#000"
color="black"
text="New Group"
style={{ gridColumnStart: 1 }}
>
@ -190,7 +192,7 @@ export default function LaunchApp(props) {
<ModalButton
icon="Boot"
bg="washedGray"
color="#000"
color="black"
text="Join Group"
>
<JoinGroup {...props} />

View File

@ -1,5 +1,5 @@
import React from 'react';
import { Box, Button, Icon, Text } from '@tlon/indigo-react';
import { Row, Button, Icon, Text } from '@tlon/indigo-react';
import { useModal } from '~/logic/lib/useModal';
const ModalButton = (props) => {
@ -13,17 +13,18 @@ const ModalButton = (props) => {
onClick={showModal}
display='flex'
cursor='pointer'
justifyContent="start"
bg={bg}
p={2}
bg="white"
overflow='hidden'
border={0}
p={0}
borderRadius={2}
{...rest}
>
<Row bg={bg} p={2} width='100%' justifyContent="start" alignItems="center">
<Icon icon={props.icon} mr={2} color={color}></Icon>
<Text color={color} fontWeight="medium" whiteSpace='nowrap'>
{props.text}
</Text>
</Text></Row>
</Button>
</>
);