diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue index e2f78fe965..0d72fce836 100644 --- a/apps/app-frontend/src/App.vue +++ b/apps/app-frontend/src/App.vue @@ -29,24 +29,25 @@ import { import { Admonition, Avatar, - ButtonStyled, + ButtonLink, commonMessages, ContentInstallModal, ContentUpdaterModal, CreationFlowModal, defineMessages, I18nDebugPanel, + IconButton, IntlFormatted, LoadingBar, NewsArticleCard, NotificationPanel, - OverflowMenu, PopupNotificationPanel, provideModalBehavior, provideModrinthClient, provideNotificationManager, providePageContext, providePopupNotificationManager, + TeleportOverflowMenu, TextLogo, useDebugLogger, useFormatBytes, @@ -1591,22 +1592,29 @@ provideAppUpdateDownloadProgress(appUpdateDownload) > - - +
- - - - - - + + + + + +
- - - + +
@@ -1793,12 +1796,17 @@ provideAppUpdateDownloadProgress(appUpdateDownload) :key="`news-${index}`" :article="item" /> - - - - {{ formatMessage(messages.viewAllNews) }} - - + + + {{ formatMessage(messages.viewAllNews) }} +
diff --git a/apps/app-frontend/src/components/ui/AccountsCard.vue b/apps/app-frontend/src/components/ui/AccountsCard.vue index 9c0611ef63..ebe3e333d7 100644 --- a/apps/app-frontend/src/components/ui/AccountsCard.vue +++ b/apps/app-frontend/src/components/ui/AccountsCard.vue @@ -4,13 +4,11 @@ class="flex flex-col gap-3 bg-button-bg border border-solid border-surface-5 rounded-xl p-3 mt-2" > {{ formatMessage(messages.notSignedIn) }} - - - + - - - + + +
- - - +
@@ -95,8 +97,9 @@ import { import { Accordion, Avatar, - ButtonStyled, + Button, defineMessages, + IconButton, injectNotificationManager, useVIntl, } from '@modrinth/ui' diff --git a/apps/app-frontend/src/components/ui/AddContentButton.vue b/apps/app-frontend/src/components/ui/AddContentButton.vue index cdea116e87..65f6397a9e 100644 --- a/apps/app-frontend/src/components/ui/AddContentButton.vue +++ b/apps/app-frontend/src/components/ui/AddContentButton.vue @@ -1,6 +1,6 @@ diff --git a/apps/frontend/src/components/ui/NotificationItem.vue b/apps/frontend/src/components/ui/NotificationItem.vue index 1bbac8bf38..4f3cfa001b 100644 --- a/apps/frontend/src/components/ui/NotificationItem.vue +++ b/apps/frontend/src/components/ui/NotificationItem.vue @@ -46,18 +46,18 @@ class="flex flex-wrap items-center gap-3" :class="{ 'gap-2': compact }" > - - - - - - + +
+ + + +
+
+
+ - - - -
-
-
- - - - +
- - - - Open link - - - - - - - - + + + Open link + + +
@@ -390,10 +399,12 @@ import { } from '@modrinth/assets' import { Avatar, - ButtonStyled, + Button, + ButtonLink, Categories, CopyCode, DoubleIcon, + IconButton, injectModrinthClient, injectNotificationManager, ProjectStatusBadge, diff --git a/apps/frontend/src/components/ui/OrganizationPageHeader.vue b/apps/frontend/src/components/ui/OrganizationPageHeader.vue index c5f74542df..6063423a50 100644 --- a/apps/frontend/src/components/ui/OrganizationPageHeader.vue +++ b/apps/frontend/src/components/ui/OrganizationPageHeader.vue @@ -38,21 +38,19 @@ @@ -68,18 +66,17 @@ import { SettingsIcon, UsersIcon, } from '@modrinth/assets' +import { ButtonLink, TeleportOverflowMenu } from '@modrinth/ui' import { Avatar, - ButtonStyled, commonMessages, defineMessages, + type OverflowMenuOption, PageHeader, PageHeaderActions, PageHeaderBadgeItem, PageHeaderMetadata, PageHeaderMetadataNumberItem, - TeleportOverflowMenu, - type TeleportOverflowMenuItem, useFormatNumber, useVIntl, } from '@modrinth/ui' @@ -135,7 +132,7 @@ const emit = defineEmits<{ const { formatMessage } = useVIntl() const formatNumber = useFormatNumber() -const moreActions = computed(() => [ +const moreActions = computed(() => [ { id: 'manage-projects', label: formatMessage(messages.manageProjects), @@ -143,10 +140,7 @@ const moreActions = computed(() => [ action: () => emit('manageProjects'), shown: props.canManage, }, - { - divider: true, - shown: props.canManage, - }, + { type: 'divider', shown: props.canManage }, { id: 'copy-id', label: formatMessage(commonMessages.copyIdButton), diff --git a/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue b/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue index 6f66486fd0..46524dbff5 100644 --- a/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue +++ b/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue @@ -65,38 +65,37 @@
- - - +
- - - - diff --git a/packages/ui/src/components/base/ButtonStyled.vue b/packages/ui/src/components/base/ButtonStyled.vue deleted file mode 100644 index f546054c16..0000000000 --- a/packages/ui/src/components/base/ButtonStyled.vue +++ /dev/null @@ -1,397 +0,0 @@ - - - - - diff --git a/packages/ui/src/components/base/Card.vue b/packages/ui/src/components/base/Card.vue index f52f4533b0..c481f17eb0 100644 --- a/packages/ui/src/components/base/Card.vue +++ b/packages/ui/src/components/base/Card.vue @@ -2,7 +2,7 @@ import { DropdownIcon } from '@modrinth/assets' import { reactive } from 'vue' -import ButtonStyled from './ButtonStyled.vue' +import { IconButton } from '#ui/components/base/buttons' const props = defineProps({ collapsible: { @@ -33,11 +33,9 @@ function toggleCollapsed() {
- - - + + +
diff --git a/packages/ui/src/components/base/Chips.vue b/packages/ui/src/components/base/Chips.vue index e1359c469e..e7daddc930 100644 --- a/packages/ui/src/components/base/Chips.vue +++ b/packages/ui/src/components/base/Chips.vue @@ -15,7 +15,11 @@ }" @click="toggleItem(item)" > - +