m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-06-30 13:41:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse Source
This commit is contained in:
Mike Cao 2023-08-25 15:08:07 -07:00
commit 4fd3a66f07
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/pages/websites/WebsiteMetricsBar.js
View File

@ -7,7 +7,7 @@ import MetricsBar from 'components/metrics/MetricsBar';
import FilterSelectForm from 'components/pages/reports/FilterSelectForm'; import FilterSelectForm from 'components/pages/reports/FilterSelectForm';
import PopupForm from 'components/pages/reports/PopupForm'; import PopupForm from 'components/pages/reports/PopupForm';
import { formatShortTime } from 'lib/format'; import { formatShortTime } from 'lib/format';
import { Button, Column, Icon, Icons, Popup, PopupTrigger, Row, TooltipPopup } from 'react-basics'; import { Button, Column, Icon, Icons, Popup, PopupTrigger, Row } from 'react-basics';
import styles from './WebsiteMetricsBar.module.css'; import styles from './WebsiteMetricsBar.module.css';
export function WebsiteMetricsBar({ websiteId, showFilter = true, sticky }) { export function WebsiteMetricsBar({ websiteId, showFilter = true, sticky }) {
@ -71,14 +71,12 @@ export function WebsiteMetricsBar({ websiteId, showFilter = true, sticky }) {
const WebsiteFilterButton = () => { const WebsiteFilterButton = () => {
return ( return (
<PopupTrigger> <PopupTrigger>
<TooltipPopup label={formatMessage(labels.addFilter)} position="top"> <Button>
<Button> <Icon>
<Icon> <Icons.Plus />
<Icons.Plus /> </Icon>
</Icon> {formatMessage(labels.filter)}
{formatMessage(labels.filter)} </Button>
</Button>
</TooltipPopup>
<Popup position="bottom" alignment="start" className={styles.popup}> <Popup position="bottom" alignment="start" className={styles.popup}>
{close => { {close => {
return ( return (