urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-19 16:51:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4383 from urbit/mp/qa/fe-fix-4

Browse Source
This commit is contained in:
L 2021-02-05 11:18:46 -06:00 committed by GitHub
commit 7d722d53b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/interface/src/views/apps/notifications/graph.tsx
View File

@ -139,10 +139,10 @@ const GraphNodeContent = ({ group, post, contacts, mod, description, index, remo
return null; return null;
}; };
function getNodeUrl(mod: string, group: boolean, groupPath: string, graph: string, index: string) { function getNodeUrl(mod: string, hidden: boolean, groupPath: string, graph: string, index: string) {
if (!group && mod === 'chat') { if (hidden && mod === 'chat') {
groupPath = '/messages'; groupPath = '/messages';
} else if (!group) { } else if (hidden) {
groupPath = '/home'; groupPath = '/home';
} }
const graphUrl = `/~landscape${groupPath}/resource/${mod}${graph}`; const graphUrl = `/~landscape${groupPath}/resource/${mod}${graph}`;

5
pkg/interface/src/views/components/ProfileOverlay.tsx
View File

@ -165,7 +165,10 @@ class ProfileOverlay extends PureComponent<ProfileOverlayProps, {}> {
<Icon icon="Chat" size={16} onClick={() => history.push(`/~landscape/dm/${ship}`)}/> <Icon icon="Chat" size={16} onClick={() => history.push(`/~landscape/dm/${ship}`)}/>
)} )}
</Row> </Row>
<Box alignSelf="center" height="72px"> <Box
alignSelf="center"
height="72px"
onClick={() => history.push(`/~profile/~${ship}`)}>
{img} {img}
</Box> </Box>
<Col alignItems="end" justifyContent="flex-end" overflow="hidden"> <Col alignItems="end" justifyContent="flex-end" overflow="hidden">

13
pkg/interface/src/views/landscape/components/GroupSwitcher.tsx
View File

@ -83,7 +83,18 @@ export function GroupSwitcher(props: {
: associations.groups[workspace.group].metadata; : associations.groups[workspace.group].metadata;
const navTo = (to: string) => `${props.baseUrl}${to}`; const navTo = (to: string) => `${props.baseUrl}${to}`;
return ( return (
<Row width="100%" alignItems="center" height='48px' backgroundColor="white" zIndex="2" position="sticky" top="0px" pl='3' borderBottom='1px solid' borderColor='washedGray'> <Row
width="100%"
alignItems="center"
flexShrink={0}
height='48px'
backgroundColor="white"
zIndex="2"
position="sticky"
top="0px"
pl='3'
borderBottom='1px solid'
borderColor='washedGray'>
<Col <Col
bg="white" bg="white"
width="100%" width="100%"