Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fix incorrect merge conflict

Francis Cao80e366fdf617
diff --git a/src/components/input/FilterBar.tsx b/src/components/input/FilterBar.tsx
index cebfc057b..0823e4038 100644
--- a/src/components/input/FilterBar.tsx
+++ b/src/components/input/FilterBar.tsx
@@ -149,11 +149,15 @@ const FilterItem = ({ name, label, operator, value, onRemove }) => {
>
<Row alignItems="center" gap="4">
<Row alignItems="center" gap="2" maxWidth={'500px'}>
- <Text color="12" weight="bold">
+ <Text color="primary" weight="bold">
{label}
</Text>
- <Text color="11">{operator}</Text>
- <Text color="12" weight="bold" style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+ <Text color="muted">{operator}</Text>
+ <Text
+ color="primary"
+ weight="bold"
+ style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}
+ >
{value}
</Text>
</Row>