mirror of
https://github.com/urbit/shrub.git
synced 2024-12-19 16:51:42 +03:00
Merge pull request #4383 from urbit/mp/qa/fe-fix-4
This commit is contained in:
commit
7d722d53b5
@ -139,10 +139,10 @@ const GraphNodeContent = ({ group, post, contacts, mod, description, index, remo
|
||||
return null;
|
||||
};
|
||||
|
||||
function getNodeUrl(mod: string, group: boolean, groupPath: string, graph: string, index: string) {
|
||||
if (!group && mod === 'chat') {
|
||||
function getNodeUrl(mod: string, hidden: boolean, groupPath: string, graph: string, index: string) {
|
||||
if (hidden && mod === 'chat') {
|
||||
groupPath = '/messages';
|
||||
} else if (!group) {
|
||||
} else if (hidden) {
|
||||
groupPath = '/home';
|
||||
}
|
||||
const graphUrl = `/~landscape${groupPath}/resource/${mod}${graph}`;
|
||||
|
@ -165,7 +165,10 @@ class ProfileOverlay extends PureComponent<ProfileOverlayProps, {}> {
|
||||
<Icon icon="Chat" size={16} onClick={() => history.push(`/~landscape/dm/${ship}`)}/>
|
||||
)}
|
||||
</Row>
|
||||
<Box alignSelf="center" height="72px">
|
||||
<Box
|
||||
alignSelf="center"
|
||||
height="72px"
|
||||
onClick={() => history.push(`/~profile/~${ship}`)}>
|
||||
{img}
|
||||
</Box>
|
||||
<Col alignItems="end" justifyContent="flex-end" overflow="hidden">
|
||||
|
@ -83,7 +83,18 @@ export function GroupSwitcher(props: {
|
||||
: associations.groups[workspace.group].metadata;
|
||||
const navTo = (to: string) => `${props.baseUrl}${to}`;
|
||||
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
|
||||
bg="white"
|
||||
width="100%"
|
||||
|
Loading…
Reference in New Issue
Block a user