Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	components/pages/login/LoginForm.js
This commit is contained in:
Mike Cao committed 2023-01-11 14:48:17 -08:00
commit 53ec66e820
11 files changed
+67 -53

No files matched your search

-1
View File
@@ -211,7 +211,6 @@ export default function EventDataForm({ websiteId, onClose, className }) {
<TextField />
</FormInput>
</FormRow>
+
<FormButtons className={styles.formButtons}>
<Button variant="action" type="submit">
<FormattedMessage id="label.add-filter" defaultMessage="Add Filter" />
@@ -57,13 +57,11 @@ export default function UsersTable({ columns = defaultColumns, onLoading, onAddK
row.action = (
<div className={styles.actions}>
<Link href={`/users/${row.id}`} shallow>
<a>
<Button>
<Icon icon="arrow-right" />
Settings
</Button>
</a>
<Link href={`/settings/users/${row.id}`}>
<Button>
<Icon icon="arrow-right" />
Settings
</Button>
</Link>
</div>
);