Skip to content

Commit 229d6e4

Browse files
authored
Merge pull request #46 from Fabulously-Optimized/fixes
Fixes and dependency updates
2 parents 3c98908 + 92ff3e1 commit 229d6e4

File tree

6 files changed

+1409
-4001
lines changed

6 files changed

+1409
-4001
lines changed

app.scss

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
/** Gradients **/
44
.supercharge__gradient {
5+
display: inline-block;
56
background: linear-gradient(
67
90deg,
78
#f5a50f 0%,

components/Footer.vue

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import { Avatar } from "omorphia";
5151
background-color: var(--color-raised-bg);
5252
color: var(--color-base);
5353
padding: 3rem;
54-
margin-top: 5rem;
5554
margin-bottom: 0rem;
5655
border-top: 1px solid var(--color-border);
5756
border-bottom: 1px solid var(--color-border);

components/Navbar.vue

+43-5
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ console.log(languageOptionFilter.value);
5252
<NuxtLink to="/wiki" :external="true" class="side__link">{{
5353
$t("navbar.links.wiki")
5454
}}</NuxtLink>
55-
<NuxtLink to="/curseforge" class="side__link">CurseForge</NuxtLink>
56-
<NuxtLink to="/modrinth" class="side__link">Modrinth</NuxtLink>
55+
<NuxtLink to="/curseforge" :external="true" class="side__link">CurseForge</NuxtLink>
56+
<NuxtLink to="/modrinth" :external="true" class="side__link">Modrinth</NuxtLink>
5757
<NuxtLink to="/contribute" class="side__link">{{
5858
$t("navbar.links.contribute")
5959
}}</NuxtLink>
@@ -101,11 +101,48 @@ console.log(languageOptionFilter.value);
101101
<NuxtLink to="/" class="side__link">{{
102102
$t("navbar.links.home")
103103
}}</NuxtLink>
104-
<!-- <NuxtLink to="/changelog" class="side__link">Changelog</NuxtLink> -->
105-
<NuxtLink to="/github" class="side__link">GitHub</NuxtLink>
106-
<NuxtLink to="/wiki" class="side__link">{{
104+
<NuxtLink to="/wiki" :external="true" class="side__link">{{
107105
$t("navbar.links.wiki")
108106
}}</NuxtLink>
107+
<NuxtLink to="/curseforge" :external="true" class="side__link">CurseForge</NuxtLink>
108+
<NuxtLink to="/modrinth" :external="true" class="side__link">Modrinth</NuxtLink>
109+
<NuxtLink to="/contribute" class="side__link">{{
110+
$t("navbar.links.contribute")
111+
}}</NuxtLink>
112+
</div>
113+
<div class="side__buttons">
114+
<Button iconOnly class="button__rounded_icon" @click="theme = !theme"
115+
><MoonIcon v-if="!theme" /><SunIcon v-else
116+
/></Button>
117+
<OverflowMenu
118+
class="btn icon-only button__rounded_icon"
119+
style="background: none; box-shadow: none !important"
120+
:options="[
121+
{
122+
id: 'language',
123+
color: 'primary',
124+
action: () => {
125+
navigateTo('/translate', {
126+
external: true,
127+
open: {
128+
target: '_blank',
129+
},
130+
});
131+
},
132+
hoverFilledOnly: false,
133+
},
134+
{ divider: true },
135+
...languageOptionFilter,
136+
]"
137+
>
138+
<LanguagesIcon />
139+
<template #language
140+
><LanguagesIcon />{{ $t("navbar.action.language") }}</template
141+
>
142+
<template v-for="_locale of availableLocales" v-slot:[_locale.code]>{{
143+
_locale.name
144+
}}</template>
145+
</OverflowMenu>
109146
</div>
110147
</Card>
111148
</template>
@@ -200,6 +237,7 @@ console.log(languageOptionFilter.value);
200237
left: calc(var(--gap-xl) * -4);
201238
flex-direction: row;
202239
gap: var(--gap-xl);
240+
flex-wrap: wrap;
203241
}
204242
205243
.side__profile {

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
},
1212
"devDependencies": {
1313
"@nuxt/devtools": "latest",
14-
"@nuxt/image": "^1.0.0",
15-
"@nuxtjs/color-mode": "^3.3.0",
16-
"@nuxtjs/i18n": "8.0.0-rc.5",
17-
"nuxt": "^3.10.0",
18-
"vue": "^3.3.6",
19-
"vue-router": "^4.2.5"
14+
"@nuxt/image": "^1.3.0",
15+
"@nuxtjs/color-mode": "^3.3.2",
16+
"@nuxtjs/i18n": "8.1.1",
17+
"nuxt": "^3.10.3",
18+
"vue": "^3.4.19",
19+
"vue-router": "^4.3.0"
2020
},
2121
"dependencies": {
22-
"omorphia": "^0.6.5",
23-
"sass": "^1.69.4"
22+
"omorphia": "^0.7.3",
23+
"sass": "^1.71.1"
2424
}
2525
}

pages/index.vue

+3-4
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,9 @@ const features: any = ref([
8686
</script>
8787

8888
<template>
89-
<!-- <Modal class="download_modal" header="Download" ref="download_modal"
90-
><DownloadSection
91-
/></Modal> -->
9289
<div class="columned-hero">
9390
<div class="column">
94-
<h1 v-html="$t('content.home.columned-hero.title')"></h1>
91+
<h1 id="title-with-gradient" v-html="$t('content.home.columned-hero.title')"></h1>
9592
<p class="subtitle">{{ $t("content.home.columned-hero.subtitle") }}</p>
9693
<br />
9794
<div class="buttons">
@@ -271,6 +268,7 @@ h3 {
271268
// On mobile, hide graph
272269
@media (max-width: 999px) {
273270
.columned-hero {
271+
display: wrap;
274272
grid-template-columns: 1fr;
275273
grid-template-rows: 1fr;
276274
margin-bottom: 0 !important;
@@ -303,6 +301,7 @@ h3 {
303301
display: flex;
304302
flex-direction: row;
305303
gap: var(--gap-md);
304+
flex-wrap: wrap;
306305
}
307306
308307
#disclaimer-text, #disclaimer-text > a{

0 commit comments

Comments
 (0)