diff --git a/apps/frontend/src/assets/styles/components.scss b/apps/frontend/src/assets/styles/components.scss index 87434d1b98..ad5da17d1e 100644 --- a/apps/frontend/src/assets/styles/components.scss +++ b/apps/frontend/src/assets/styles/components.scss @@ -93,7 +93,7 @@ } } - :where(button:not([data-button]), .button, .iconified-button) { + :where(button:not([data-button])) { width: fit-content; } @@ -118,7 +118,6 @@ gap: var(--spacing-card-sm); margin-bottom: calc(var(--spacing-card-sm) + var(--spacing-card-md)); - .iconified-button, .input-group { flex-shrink: 0; } @@ -250,185 +249,6 @@ } } -.button-base { - @extend .button-animation; - font-weight: 500; - outline: 2px solid transparent; - - &:focus-visible:not(&:disabled), - &:hover:not(&:disabled) { - cursor: pointer; - filter: brightness(0.85); - } - - &:active:not(&:disabled) { - filter: brightness(0.8); - } - - &:disabled, - &[disabled='true'] { - cursor: not-allowed; - filter: grayscale(50%); - opacity: 0.5; - box-shadow: none; - } -} - -:not(tr).button-transparent { - @extend .button-base; - background-color: transparent; - border-radius: var(--size-rounded-sm); - - &:focus-visible:not(&:disabled), - &:hover:not(&:disabled), - &:active:not(&:disabled) { - background-color: var(--color-raised-bg); - } - - &.brand-button { - color: var(--color-brand); - } - - &.danger-button { - color: var(--color-red); - } -} - -tr.button-transparent { - @extend .button-animation; - background-color: transparent; - border-radius: var(--size-rounded-sm); - - &:focus-visible:not(&:disabled) > *, - &:hover:not(&:disabled) > * { - cursor: pointer; - filter: brightness(0.85); - background-color: var(--color-raised-bg); - } - - &:active:not(&:disabled) > * { - filter: brightness(0.8); - background-color: var(--color-raised-bg); - } - - &:disabled > *, - &[disabled='true'] > * { - cursor: not-allowed; - filter: grayscale(50%); - opacity: 0.5; - box-shadow: none; - } -} - -.button-color-base { - box-sizing: border-box; - --text-color: var(--color-button-text); - --background-color: var(--color-button-bg); - - color: var(--text-color); - background-color: var(--background-color); - box-shadow: - var(--shadow-inset-sm), - 0 0 0 0 transparent; - border-radius: var(--size-rounded-sm); -} - -.iconified-button { - @extend .button-base; - @extend .button-color-base; - - display: flex; - padding: var(--spacing-card-sm) var(--spacing-card-bg); - margin: 0; - font-size: var(--font-size-nm); - align-items: center; - cursor: pointer; - width: fit-content; - height: fit-content; - transition: - opacity 0.5s ease-in-out, - filter 0.2s ease-in-out, - scale 0.05s ease-in-out, - outline 0.2s ease-in-out; - - text-decoration: none; - - svg { - width: 1.1rem; - height: 1.1rem; - margin-right: 0.5rem; - } - - &.icon-only { - padding: 0 0.5rem; - - svg { - margin-right: 0; - } - } - - &.transparent { - background: none; - box-shadow: none; - } -} - -.square-button { - @extend .button-base; - - --text-color: var(--color-button-text); - --background-color: var(--color-button-bg); - - display: flex; - align-items: center; - justify-content: center; - height: 2.25rem; - width: 2.25rem; - border-radius: var(--size-rounded-sm); - color: var(--text-color); - background-color: var(--background-color); - box-shadow: - var(--shadow-inset-sm), - 0 0 0 0 transparent; - - svg { - min-width: 1.25rem; - max-width: 1.25rem; - min-height: 1.25rem; - max-height: 1.25rem; - } - - flex-shrink: 0; -} - -.raised-button { - --background-color: var(--color-raised-bg); - box-shadow: var(--shadow-inset-sm), var(--shadow-raised); -} - -.danger-button { - --background-color: var(--color-red); - --text-color: var(--color-brand-inverted); -} - -.moderation-button { - --background-color: var(--color-orange); - --text-color: var(--color-brand-inverted); -} - -.brand-button { - --background-color: var(--color-brand); - --text-color: var(--color-brand-inverted); -} - -.button-group { - display: flex; - grid-gap: var(--spacing-card-sm); - flex-wrap: wrap; - margin-top: var(--spacing-card-md); - justify-content: right; -} - .error { display: flex; flex-direction: column; @@ -501,7 +321,6 @@ textarea.known-error { } @media (prefers-reduced-motion) { - .button-animation, button { transform: none !important; } diff --git a/apps/frontend/src/assets/styles/global.scss b/apps/frontend/src/assets/styles/global.scss index 8ad63c2da1..edc80e96d8 100644 --- a/apps/frontend/src/assets/styles/global.scss +++ b/apps/frontend/src/assets/styles/global.scss @@ -475,18 +475,6 @@ input { outline: 2px solid transparent !important; } -.button-animation { - transition: - opacity 0.5s ease-in-out, - filter 0.2s ease-in-out, - transform 0.05s ease-in-out, - outline-width 0.2s ease-in-out; -} - -.button-transparent { - box-shadow: none; -} - .qc-cmp2-close-tooltip { background-color: transparent; color: hsl(145, 78%, 28%); diff --git a/apps/frontend/src/components/ui/Chips.vue b/apps/frontend/src/components/ui/Chips.vue deleted file mode 100644 index 17905aa13c..0000000000 --- a/apps/frontend/src/components/ui/Chips.vue +++ /dev/null @@ -1,103 +0,0 @@ - - - - - diff --git a/apps/frontend/src/components/ui/ModrinthFooter.vue b/apps/frontend/src/components/ui/ModrinthFooter.vue index 4c47ca7742..84da60b415 100644 --- a/apps/frontend/src/components/ui/ModrinthFooter.vue +++ b/apps/frontend/src/components/ui/ModrinthFooter.vue @@ -7,7 +7,7 @@ import { ToggleRightIcon, TwitterIcon, } from '@modrinth/assets' -import { ButtonLink } from '@modrinth/ui' +import { Button, ButtonLink } from '@modrinth/ui' import { AutoLink, defineMessage, @@ -266,11 +266,17 @@ function developerModeIncrement() { :aria-label="formatMessage(messages.modrinthInformation)" >
-
- - + - -
+
-
+
-
+
-
+
- +

This project is not managed by an organization. If you are the member of any organizations, @@ -562,6 +564,7 @@ import { Avatar, Badge, Button, + ButtonLink, Card, Checkbox, Combobox, diff --git a/apps/frontend/src/pages/[type]/[project]/settings/tags.vue b/apps/frontend/src/pages/[type]/[project]/settings/tags.vue index 77acc7d932..cbfc414335 100644 --- a/apps/frontend/src/pages/[type]/[project]/settings/tags.vue +++ b/apps/frontend/src/pages/[type]/[project]/settings/tags.vue @@ -434,11 +434,6 @@ const toggleFeaturedCategory = (category: Category) => { vertical-align: top; } } - -.button-group { - justify-content: flex-start; -} - .category-list { column-count: 4; column-gap: var(--spacing-card-lg); diff --git a/apps/frontend/src/pages/admin/billing/[user].vue b/apps/frontend/src/pages/admin/billing/[user].vue index 72ad4e591b..e8e9d75300 100644 --- a/apps/frontend/src/pages/admin/billing/[user].vue +++ b/apps/frontend/src/pages/admin/billing/[user].vue @@ -166,7 +166,7 @@ v-if=" subscription.metadata?.type === 'pyro' || subscription.metadata?.type === 'medal' " - :to="`/hosting/manage/${subscription.metadata.id}`" + :href="`/hosting/manage/${subscription.metadata.id}`" target="_blank" class="w-fit" > diff --git a/apps/frontend/src/pages/app.vue b/apps/frontend/src/pages/app.vue index 284e9bd844..4f94a7ac1a 100644 --- a/apps/frontend/src/pages/app.vue +++ b/apps/frontend/src/pages/app.vue @@ -18,6 +18,7 @@ import { Avatar, Badge, Button, + ButtonLink, Checkbox, commonMessages, defineMessages, @@ -546,7 +547,7 @@ useSeoMeta({

{{ formatMessage(messages.description) }}

-
+
@@ -1228,13 +1231,6 @@ useSeoMeta({ mask-image: none; } - .button-group { - width: fit-content; - margin: 0 auto; - justify-content: center; - mask-image: none; - } - img { width: 100%; max-width: 65rem; diff --git a/apps/frontend/src/pages/dashboard/organizations.vue b/apps/frontend/src/pages/dashboard/organizations.vue index d258f0e5af..fddcf8b664 100644 --- a/apps/frontend/src/pages/dashboard/organizations.vue +++ b/apps/frontend/src/pages/dashboard/organizations.vue @@ -13,11 +13,13 @@
@@ -51,7 +53,14 @@