diff --git a/.gitignore b/.gitignore index 6c40725a0..39085814f 100644 --- a/.gitignore +++ b/.gitignore @@ -38,9 +38,6 @@ testem.log .DS_Store Thumbs.db -.nx/cache -.nx/workspace-data - # Nuxt dev/build outputs .output .data @@ -54,3 +51,4 @@ apps/frontend/src/generated .turbo target generated +.env diff --git a/apps/app-frontend/.env b/apps/app-frontend/.env deleted file mode 100644 index 6684c4059..000000000 --- a/apps/app-frontend/.env +++ /dev/null @@ -1,3 +0,0 @@ -BASE_URL=https://staging-api.modrinth.com/v2/ -BROWSER_BASE_URL=https://staging-api.modrinth.com/v2/ -BASE_URL= diff --git a/apps/frontend/.env b/apps/frontend/.env new file mode 100644 index 000000000..bd54ceb10 --- /dev/null +++ b/apps/frontend/.env @@ -0,0 +1,2 @@ +BASE_URL=https://api.modrinth.com/v2/ +BROWSER_BASE_URL=https://api.modrinth.com/v2/ diff --git a/apps/frontend/src/assets/styles/components.scss b/apps/frontend/src/assets/styles/components.scss index 392a39c57..175e344d8 100644 --- a/apps/frontend/src/assets/styles/components.scss +++ b/apps/frontend/src/assets/styles/components.scss @@ -1299,7 +1299,7 @@ svg.inline-svg { .tag-list__item { background-color: var(--color-button-bg); - padding: var(--gap-2) var(--gap-6); + padding: var(--gap-4) var(--gap-8); border-radius: var(--radius-max); font-weight: var(--weight-bold); font-size: var(--text-14); diff --git a/apps/frontend/src/assets/styles/layout.scss b/apps/frontend/src/assets/styles/layout.scss index c33bd8f5b..808b677e5 100644 --- a/apps/frontend/src/assets/styles/layout.scss +++ b/apps/frontend/src/assets/styles/layout.scss @@ -64,10 +64,6 @@ } } -.site-header { - margin: 0 0.75rem; -} - @media (min-width: 1024px) { .full-page { margin: 0 auto; @@ -119,3 +115,40 @@ overflow-x: hidden; } } + +.new-page { + display: grid; + margin: 0 auto; + max-width: 80rem; + column-gap: 0.75rem; + padding: 0 0.75rem; + + grid-template: + "header" + "content" + "sidebar" + / 100%; + + @media screen and (min-width: 1024px) { + grid-template: + "header header" auto + "content sidebar" auto + "content dummy" 1fr + / 1fr 20rem; + + .normal-page__sidebar { + min-width: 20rem; + width: 20rem; + } + } + + .normal-page__sidebar { + grid-area: sidebar; + } + + .normal-page__content { + grid-area: content; + max-width: calc(60rem - 0.75rem); + overflow-x: hidden; + } +} diff --git a/apps/frontend/src/components/ui/Pagination.vue b/apps/frontend/src/components/ui/Pagination.vue index 4c8714700..b04408887 100644 --- a/apps/frontend/src/components/ui/Pagination.vue +++ b/apps/frontend/src/components/ui/Pagination.vue @@ -118,6 +118,7 @@ export default {