diff --git a/app/router.scrollBehavior.js b/app/router.scrollBehavior.js index 73fd49c8e..1dd2f351e 100644 --- a/app/router.scrollBehavior.js +++ b/app/router.scrollBehavior.js @@ -1,7 +1,7 @@ export default function (to, from, savedPosition) { - if (to.name.startsWith('type-id') && !from.name.startsWith('type-id')) { - return { x: 0, y: 0 } - } else { + if (to.name.startsWith('type-id') && from.name.startsWith('type-id')) { return savedPosition + } else { + return { x: 0, y: 0 } } } diff --git a/assets/styles/components.scss b/assets/styles/components.scss index 3fcea3463..4df819722 100644 --- a/assets/styles/components.scss +++ b/assets/styles/components.scss @@ -31,8 +31,6 @@ box-shadow: inset 0px -1px 1px rgba(17, 24, 39, 0.1); - max-height: 2rem; - color: var(--color-button-text); background-color: var(--color-button-bg); text-decoration: none; @@ -385,23 +383,19 @@ .multiselect { color: var(--color-text) !important; + max-height: 40px; input { background: transparent; } - &.top-margin { - .multiselect__tags { - padding-top: 10px; - } - } - .multiselect__tags { border-radius: 1.25rem; background: var(--color-dropdown-bg); border: none; cursor: pointer; padding-left: 1rem; + padding-top: 10px; &:active, &:hover { @@ -436,6 +430,8 @@ background: var(--color-dropdown-bg); border: none; overflow-x: hidden; + border-bottom-left-radius: var(--size-rounded-card); + border-bottom-right-radius: var(--size-rounded-card); .multiselect__element { .multiselect__option--highlight { @@ -470,6 +466,10 @@ label { span { flex: 2; padding-right: var(--spacing-card-lg); + + &.no-padding { + padding-right: 0; + } } input, @@ -518,8 +518,10 @@ label { } .stylized-toggle { + min-height: 32px; height: 32px; width: 52px; + max-width: 52px; border-radius: 16px; display: inline-block; position: relative; @@ -563,8 +565,14 @@ label { height: 1.75rem; width: 1.75rem; border-radius: 1.5rem; - background-color: var(--color-button-bg); + color: var(--color-brand-inverted); + background-color: var(--color-brand); margin-right: var(--spacing-card-sm); + + &:hover { + background-color: var(--color-brand-hover); + } + svg { width: 1.25rem; margin: auto; @@ -682,3 +690,29 @@ label { // box-shadow: var(--shadow-card); } + +.vue-notification-group { + right: 25px !important; + + .vue-notification-template { + border-radius: var(--size-rounded-card); + margin: 0 0 25px 0; + + .notification-title { + font-size: var(--font-size-lg); + margin-right: auto; + } + + .notification-content { + font-size: var(--font-size-md); + } + } +} + +.card-divider { + background-color: var(--color-divider); + border: none; + color: var(--color-divider); + height: 1px; + margin: var(--spacing-card-bg) 0; +} diff --git a/assets/styles/global.scss b/assets/styles/global.scss index e4cb46d27..06d85f505 100644 --- a/assets/styles/global.scss +++ b/assets/styles/global.scss @@ -2,10 +2,6 @@ html { @extend .light-mode; } -body { - overflow-y: scroll; -} - .light-mode { --color-icon: #6b7280; --color-text: hsl(221, 39%, 11%); @@ -30,7 +26,7 @@ body { --color-brand-3: #30b27b; --color-brand-disabled: #e2e8f0; - --color-button-bg: #e6e7eb; + --color-button-bg: #e0e0e5; --color-button-text: var(--color-text-dark); --color-button-bg-hover: #d9dce0; --color-button-text-hover: #1b1e24; @@ -259,15 +255,9 @@ textarea { padding: 0.5rem 1rem; border: 2px solid transparent; - &:focus, - &:hover:not([disabled]) { + &:hover:not([disabled]):not(:focus) { background: var(--color-button-bg-hover); color: var(--color-text); - //outline: none; Bad for accessibility - - &::placeholder { - color: var(--color-text); - } } &:focus { @@ -275,10 +265,6 @@ textarea { border-color: var(--color-divider-dark); } - &::placeholder { - color: var(--color-color-text); - } - &:disabled, &[disabled] { opacity: 0.6; diff --git a/assets/styles/layout.scss b/assets/styles/layout.scss index d2d4fbeab..5eec133b2 100644 --- a/assets/styles/layout.scss +++ b/assets/styles/layout.scss @@ -48,6 +48,11 @@ flex-direction: row; margin: 0 auto; max-width: 80rem; + column-gap: 0.75rem; + + &.alt-layout { + flex-direction: row-reverse; + } } .normal-page__sidebar { @@ -55,7 +60,6 @@ } .normal-page__content { - padding-left: 0.75rem; width: 60rem; } } diff --git a/assets/styles/utils.scss b/assets/styles/utils.scss index f57ae6841..8256d15cf 100644 --- a/assets/styles/utils.scss +++ b/assets/styles/utils.scss @@ -6,6 +6,7 @@ width: 100%; } -html { +body { overflow-y: scroll; + overflow-x: hidden; } diff --git a/components/ui/ProjectCard.vue b/components/ui/ProjectCard.vue index d525e8d76..d824a8014 100644 --- a/components/ui/ProjectCard.vue +++ b/components/ui/ProjectCard.vue @@ -198,8 +198,15 @@ export default { }, }, methods: { - formatNumber(x) { - return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') + formatNumber(y) { + const x = +y + if (x >= 1000000) { + return (x / 1000000).toFixed(2).toString() + 'M' + } else if (x >= 10000) { + return (x / 1000).toFixed(1).toString() + 'K' + } else { + return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') + } }, }, } @@ -213,7 +220,6 @@ export default { .project-card { display: flex; flex-direction: row; - flex-direction: column; padding: var(--spacing-card-bg); width: calc(100% - 2 * var(--spacing-card-bg)); @@ -300,8 +306,9 @@ export default { margin-right: 2rem; svg { + width: 1.25rem; height: 1.25rem; - margin-right: 0.125rem; + margin-right: 0.25rem; } } } @@ -359,6 +366,15 @@ export default { @media screen and (max-width: 560px) { .card-content { flex-direction: column; + + .info { + .dates { + .date { + margin-bottom: 0.5rem; + } + } + } + .right-side { padding-top: var(--spacing-card-sm); @@ -368,10 +384,6 @@ export default { margin-left: 0; } - .buttons { - flex-direction: row; - } - .buttons button, a { margin-left: unset; diff --git a/layouts/default.vue b/layouts/default.vue index 79941e67f..95c051ed1 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -226,7 +226,7 @@
modrinth/knossos {{ version }}
© Guavy LLC
-