edits to nav and links

This commit is contained in:
Martina 2021-05-17 13:20:55 -07:00
parent 2388141129
commit 22197bdf5a
4 changed files with 6 additions and 5 deletions

View File

@ -159,11 +159,10 @@ export default class ApplicationHeader extends React.Component {
};
_handleTogglePopup = (value) => {
console.log(value);
if (!value || this.state.popup === value) {
this.setState({ popup: null });
} else {
this.setState({ popup: value });
this.setState({ popup: value, showDropdown: false });
}
};
@ -352,7 +351,9 @@ export default class ApplicationHeader extends React.Component {
<div
css={Styles.ICON_CONTAINER}
style={{ pointerEvents: "auto" }}
onClick={() => this.setState({ showDropdown: !this.state.showDropdown })}
onClick={() =>
this.setState({ showDropdown: !this.state.showDropdown, popup: null })
}
>
<SVG.MenuMinimal height="16px" />
</div>

View File

@ -10,7 +10,7 @@ const STYLES_SCENE = css`
display: block;
@media (max-width: ${Constants.sizes.mobile}px) {
padding: 36px 24px 128px 24px;
padding: 36px 16px 128px 16px;
}
`;

View File

@ -1298,6 +1298,7 @@ export class SlateLayout extends React.Component {
this.state.layout.map((pos, i) => (
<Link
key={i}
disabled={this.state.editing}
redirect
params={{ ...this.props.page?.params, cid: this.state.items[i].cid }}
onAction={this.props.onAction}

View File

@ -23,7 +23,6 @@ const STYLES_POPOVER_SECTION = css`
border-bottom: 1px solid ${Constants.system.gray40};
padding-bottom: 6px;
margin-bottom: 6px;
width: calc(100% - 32px);
:last-child {
border-bottom: none;