mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-09-21 15:38:59 +03:00
Merge pull request #3862 from urbit/mp/two-tweak
landscape: hide new channel container, daybreak in unread marker
This commit is contained in:
commit
9682a6f39d
@ -18,9 +18,6 @@ export const UnreadMarker = React.forwardRef(({ dayBreak, when }, ref) => (
|
||||
<Rule borderColor='blue' display={['none', 'block']} m='0' width='2rem' />
|
||||
<Text flexShrink='0' display='block' zIndex='2' mx='4' color='blue'>New messages below</Text>
|
||||
<Rule borderColor='blue' flexGrow='1' m='0'/>
|
||||
{dayBreak
|
||||
? <Text display='block' gray mx='4'>{moment(when).calendar(null, { sameElse: DATESTAMP_FORMAT })}</Text>
|
||||
: null}
|
||||
<Rule style={{ width: "calc(50% - 48px)" }} borderColor='blue' m='0' />
|
||||
</Row>
|
||||
));
|
||||
|
@ -97,10 +97,6 @@ export function Sidebar(props: SidebarProps) {
|
||||
const role = props.groups?.[groupPath] ? roleForShip(props.groups[groupPath], window.ship) : undefined;
|
||||
const isAdmin = (role === "admin") || (workspace?.type === 'home');
|
||||
|
||||
const newStyle = {
|
||||
display: isAdmin ? "block" : "none"
|
||||
};
|
||||
|
||||
return (
|
||||
<Col
|
||||
display={display}
|
||||
@ -142,7 +138,7 @@ export function Sidebar(props: SidebarProps) {
|
||||
<SidebarStickySpacer flexShrink={0} />
|
||||
<Box
|
||||
flexShrink="0"
|
||||
display="flex"
|
||||
display={isAdmin ? "flex" : "none"}
|
||||
justifyContent="center"
|
||||
position="sticky"
|
||||
bottom={"8px"}
|
||||
@ -151,7 +147,6 @@ export function Sidebar(props: SidebarProps) {
|
||||
py="2"
|
||||
>
|
||||
<Link
|
||||
style={newStyle}
|
||||
to={!!groupPath ? `/~landscape${groupPath}/new` : `/~landscape/home/new`}
|
||||
>
|
||||
<Box
|
||||
|
Loading…
Reference in New Issue
Block a user