mirror of
https://github.com/kremalicious/umami.git
synced 2025-02-14 21:10:34 +01:00
Mobile css updates.
This commit is contained in:
parent
cdd7273194
commit
5f821461c2
@ -1,3 +1,4 @@
|
|||||||
|
import classNames from 'classnames';
|
||||||
import Link from './Link';
|
import Link from './Link';
|
||||||
import Button from './Button';
|
import Button from './Button';
|
||||||
import XMark from 'assets/xmark.svg';
|
import XMark from 'assets/xmark.svg';
|
||||||
@ -5,9 +6,9 @@ import styles from './MobileMenu.module.css';
|
|||||||
|
|
||||||
export default function MobileMenu({ items = [], onClose }) {
|
export default function MobileMenu({ items = [], onClose }) {
|
||||||
return (
|
return (
|
||||||
<div className={styles.menu}>
|
<div className={classNames(styles.menu, 'container')}>
|
||||||
<div className={styles.header}>
|
<div className={styles.header}>
|
||||||
<Button className={styles.button} icon={<XMark />} onClick={onClose} />
|
<Button icon={<XMark />} onClick={onClose} />
|
||||||
</div>
|
</div>
|
||||||
<div className={styles.items}>
|
<div className={styles.items}>
|
||||||
{items.map(({ label, value }) => (
|
{items.map(({ label, value }) => (
|
||||||
|
@ -32,13 +32,10 @@
|
|||||||
margin-top: 60px;
|
margin-top: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button {
|
|
||||||
margin-right: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
height: 100px;
|
height: 100px;
|
||||||
|
padding: 0 30px;
|
||||||
}
|
}
|
||||||
|
@ -41,6 +41,7 @@
|
|||||||
.header .buttons {
|
.header .buttons {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.links {
|
.links {
|
||||||
order: 2;
|
order: 2;
|
||||||
margin: 20px 0;
|
margin: 20px 0;
|
||||||
@ -50,7 +51,7 @@
|
|||||||
|
|
||||||
@media only screen and (max-width: 768px) {
|
@media only screen and (max-width: 768px) {
|
||||||
.header {
|
.header {
|
||||||
padding: 0 15px;
|
padding: 0 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.buttons,
|
.buttons,
|
||||||
|
@ -14,9 +14,7 @@ export default function Layout({ title, children, header = true, footer = true }
|
|||||||
</Head>
|
</Head>
|
||||||
|
|
||||||
{header && <Header />}
|
{header && <Header />}
|
||||||
<main className="container" dir={dir}>
|
<main>{children}</main>
|
||||||
{children}
|
|
||||||
</main>
|
|
||||||
{footer && <Footer />}
|
{footer && <Footer />}
|
||||||
<div id="__modals" dir={dir} />
|
<div id="__modals" dir={dir} />
|
||||||
</>
|
</>
|
||||||
|
@ -32,11 +32,11 @@ export default function WebsiteHeader({ websiteId, title, domain, showLink = fal
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<PageHeader className="row">
|
<PageHeader className="row">
|
||||||
<div className={classNames(styles.title, 'col-12 col-lg-4')}>{header}</div>
|
<div className={classNames(styles.title, 'col-10 col-lg-4 order-1 order-lg-1')}>{header}</div>
|
||||||
<div className={classNames(styles.active, 'col-6 col-lg-4')}>
|
<div className={classNames(styles.active, 'col-12 col-lg-4 order-3 order-lg-2')}>
|
||||||
<ActiveUsers websiteId={websiteId} />
|
<ActiveUsers websiteId={websiteId} />
|
||||||
</div>
|
</div>
|
||||||
<div className="col-6 col-lg-4">
|
<div className="col-2 col-lg-4 order-2 order-lg-3">
|
||||||
<ButtonLayout align="right">
|
<ButtonLayout align="right">
|
||||||
<RefreshButton websiteId={websiteId} />
|
<RefreshButton websiteId={websiteId} />
|
||||||
{showLink && (
|
{showLink && (
|
||||||
|
@ -25,4 +25,8 @@
|
|||||||
.active {
|
.active {
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
a.link {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,6 @@ import { useRouter } from 'next/router';
|
|||||||
import MenuButton from 'components/common/MenuButton';
|
import MenuButton from 'components/common/MenuButton';
|
||||||
import Icon from 'components/common/Icon';
|
import Icon from 'components/common/Icon';
|
||||||
import User from 'assets/user.svg';
|
import User from 'assets/user.svg';
|
||||||
import Chevron from 'assets/chevron-down.svg';
|
|
||||||
import styles from './UserButton.module.css';
|
import styles from './UserButton.module.css';
|
||||||
import { removeItem } from 'lib/web';
|
import { removeItem } from 'lib/web';
|
||||||
import { AUTH_TOKEN } from 'lib/constants';
|
import { AUTH_TOKEN } from 'lib/constants';
|
||||||
@ -42,10 +41,10 @@ export default function UserButton() {
|
|||||||
return (
|
return (
|
||||||
<MenuButton
|
<MenuButton
|
||||||
icon={<Icon icon={<User />} size="large" />}
|
icon={<Icon icon={<User />} size="large" />}
|
||||||
value={<Icon icon={<Chevron />} size="small" />}
|
|
||||||
buttonVariant="light"
|
buttonVariant="light"
|
||||||
options={menuOptions}
|
options={menuOptions}
|
||||||
onSelect={handleSelect}
|
onSelect={handleSelect}
|
||||||
|
hideLabel
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user