diff --git a/COPYING.md b/COPYING.md index ab6477fb2..c569708f0 100644 --- a/COPYING.md +++ b/COPYING.md @@ -9,9 +9,7 @@ Any files depicting the Modrinth branding, including the wrench-in-labyrinth log This includes, but may not be limited to, the following files: - assets/images/404.svg -- assets/images/landing.svg - assets/images/logo.svg -- assets/images/text-logo.svg - components/brand/* - static/favicon.ico - static/favicon-light.ico diff --git a/assets/images/external/atlauncher.svg b/assets/images/external/atlauncher.svg new file mode 100644 index 000000000..fa2799c88 --- /dev/null +++ b/assets/images/external/atlauncher.svg @@ -0,0 +1 @@ + diff --git a/assets/images/external/multimc.png b/assets/images/external/multimc.png new file mode 100644 index 000000000..5251656db Binary files /dev/null and b/assets/images/external/multimc.png differ diff --git a/assets/images/external/prism.svg b/assets/images/external/prism.svg new file mode 100644 index 000000000..ee5dc7248 --- /dev/null +++ b/assets/images/external/prism.svg @@ -0,0 +1,203 @@ + + + + + Prism Launcher Logo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prism Launcher Logo + 19/10/2022 + + + Prism Launcher + + + + + AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke + + + https://github.com/PrismLauncher/PrismLauncher + + + Prism Launcher + + + + + + + + + + + + + + + diff --git a/assets/images/illustrations/features.svg b/assets/images/illustrations/features.svg deleted file mode 100644 index b71deda80..000000000 --- a/assets/images/illustrations/features.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/images/landing-gradient.svg b/assets/images/landing-gradient.svg deleted file mode 100644 index 0c287e742..000000000 --- a/assets/images/landing-gradient.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/images/landing.svg b/assets/images/landing.svg deleted file mode 100644 index 8645a8425..000000000 --- a/assets/images/landing.svg +++ /dev/null @@ -1,1557 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/images/text-logo.svg b/assets/images/text-logo.svg deleted file mode 100644 index d3f262917..000000000 --- a/assets/images/text-logo.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/assets/styles/global.scss b/assets/styles/global.scss index 9a6c05c04..18731680e 100644 --- a/assets/styles/global.scss +++ b/assets/styles/global.scss @@ -1,5 +1,5 @@ html { - @extend .light-mode; + @extend .dark-mode; --dark-color-text: #b0bac5; --dark-color-text-dark: #ecf9fb; } @@ -91,6 +91,49 @@ html { hsla(0, 0%, 0%, 0.1) 0px 2px 4px -1px; --shadow-card: rgba(50, 50, 100, 0.1) 0px 2px 4px 0px; + + --landing-maze-bg: url('https://cdn.modrinth.com/landing/landing-light.png'); + --landing-maze-gradient-bg: url('https://cdn.modrinth.com/landing/landing-lower-light.png'); + --landing-maze-outer-bg: linear-gradient(180deg, #f0f0f0 0%, #ffffff 100%); + + --landing-color-heading: #000; + --landing-color-subheading: #3a3f45; + + --landing-transition-gradient-start: rgba(255, 255, 255, 0); + --landing-transition-gradient-end: #ffffff; + --landing-hover-card-gradient: radial-gradient( + 50% 50% at 50% 50%, + #fff 0%, + rgba(204, 204, 204, 0.77) 100% + ); + --landing-border-gradient: linear-gradient( + to bottom right, + rgba(129, 137, 175, 0.75) 0%, + rgba(66, 71, 97, 0.34) 100% + ); + --landing-creator-gradient: linear-gradient( + 180deg, + #f8f8f8 0%, + #f8f8f8 63.19% + ); + + --landing-blob-gradient: radial-gradient( + 50% 50% at 50% 50%, + rgba(255, 255, 255, 0.35) 0%, + rgba(255, 255, 255, 0.2695) 100% + ); + --landing-blob-shadow: 2px 2px 12px rgba(0, 0, 0, 0.16), + inset 2px 2px 64px rgba(255, 255, 255, 0.45); + + --landing-card-bg: rgba(255, 255, 255, 0.8); + --landing-card-shadow: 2px 2px 12px rgba(0, 0, 0, 0.16); + + --landing-blue-label: #0098ba; + --landing-blue-label-bg: rgba(0, 177, 216, 0.15); + --landing-green-label: #00a936; + --landing-green-label-bg: rgba(0, 216, 69, 0.15); + + --landing-raw-bg: #fff; } .dark-mode { @@ -174,6 +217,50 @@ html { rgba(0, 0, 0, 0.06) 0px 2px 4px -1px; --shadow-card: rgba(0, 0, 0, 0.25) 0px 2px 4px 0px; + + --landing-maze-bg: url('https://cdn.modrinth.com/landing/landing.png'); + --landing-maze-gradient-bg: linear-gradient( + 0deg, + #31375f 0%, + rgba(8, 14, 55, 0) 100% + ), + url('https://cdn.modrinth.com/landing/landing-lower.png'); + --landing-maze-outer-bg: linear-gradient(180deg, #06060d 0%, #000000 100%); + + --landing-color-heading: #fff; + --landing-color-subheading: #afb6be; + + --landing-transition-gradient-start: rgba(14, 16, 32, 0); + --landing-transition-gradient-end: #060a1c; + --landing-hover-card-gradient: radial-gradient( + 50% 50% at 50% 50%, + #2c304f 0%, + rgba(32, 35, 50, 0.77) 100% + ); + --landing-border-gradient: linear-gradient( + to bottom right, + rgba(168, 177, 221, 0.75) 0%, + rgba(168, 177, 221, 0.18) 100% + ); + --landing-creator-gradient: linear-gradient(180deg, #000000 0%, #0e101d 100%); + + --landing-blob-gradient: radial-gradient( + 50% 50% at 50% 50%, + rgba(44, 48, 79, 0.35) 0%, + rgba(32, 35, 50, 0.2695) 100% + ); + --landing-blob-shadow: 2px 2px 12px rgba(0, 0, 0, 0.16), + inset 2px 2px 64px rgba(57, 61, 94, 0.45); + + --landing-card-bg: rgba(59, 63, 85, 0.15); + --landing-card-shadow: 2px 2px 12px rgba(0, 0, 0, 0.16); + + --landing-blue-label: #10c0e7; + --landing-blue-label-bg: rgba(0, 177, 216, 0.15); + --landing-green-label: #00d845; + --landing-green-label-bg: rgba(0, 216, 69, 0.15); + + --landing-raw-bg: #000; } .oled-mode { @@ -186,12 +273,6 @@ html { --color-button-bg-active: #3c3c40; } -.midas-mode { - @extend .dark-mode; - --color-brand: #fac413; - --color-brand-shadow: rgba(250, 196, 19, 0.7); -} - body { // Defaults background-color: var(--color-bg); diff --git a/components/ui/Avatar.vue b/components/ui/Avatar.vue index 4adc180f6..0ba0597d8 100644 --- a/components/ui/Avatar.vue +++ b/components/ui/Avatar.vue @@ -5,6 +5,7 @@ :class="`avatar size-${size} ${circle ? 'circle' : ''}`" :src="src" :alt="alt" + :loading="loading" /> - + diff --git a/layouts/default.vue b/layouts/default.vue index 02c5feb52..2b290fdd7 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -5,7 +5,7 @@ :class="{ 'expanded-mobile-nav': isBrowseMenuOpen }" >
diff --git a/pages/user/_id.vue b/pages/user/_id.vue index 199bed053..f27710b00 100644 --- a/pages/user/_id.vue +++ b/pages/user/_id.vue @@ -15,7 +15,7 @@
- +
diff --git a/store/tag.js b/store/tag.js index 15eb756ee..dadb19dc5 100644 --- a/store/tag.js +++ b/store/tag.js @@ -22,6 +22,11 @@ export const state = () => ({ id: 'datapack', display: 'data pack', }, + { + actual: 'shader', + id: 'shader', + display: 'shader', + }, { actual: 'resourcepack', id: 'resourcepack', @@ -32,11 +37,6 @@ export const state = () => ({ id: 'modpack', display: 'modpack', }, - { - actual: 'shader', - id: 'shader', - display: 'shader', - }, ], loaderData: { pluginLoaders: ['bukkit', 'spigot', 'paper', 'purpur', 'sponge'],