summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--public/lite/index.html2
-rw-r--r--src/App.vue12
-rw-r--r--src/components/Navigation.vue45
-rw-r--r--src/router/redirects.ts2
-rw-r--r--src/views/About.vue4
-rw-r--r--src/views/Home.vue6
-rw-r--r--src/views/Migration.vue2
-rw-r--r--src/views/Registration.vue2
8 files changed, 33 insertions, 42 deletions
diff --git a/public/lite/index.html b/public/lite/index.html
index dbdae48..f2cff3e 100644
--- a/public/lite/index.html
+++ b/public/lite/index.html
@@ -26,7 +26,7 @@
<h2>Account registration</h2>
<blockquote>
<p>To create a game account without using the full website, contact us at reg<none> </none>istration<notag/>@<notag/>themanaworld.org</p>
- <p>Make sure to <a href="https://wiki.themanaworld.org/index.php/Downloads">download our game client</a> in order to play.</p>
+ <p>Make sure to <a href="https://wiki.themanaworld.org/wiki/Downloads">download our game client</a> in order to play.</p>
</blockquote>
</section>
<section>
diff --git a/src/App.vue b/src/App.vue
index 9e4d7b3..e01a44c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,8 +26,9 @@
grid-area: page;
background: #E1D6CF;
padding: 15px 15px 30px 15px;
- border-radius: 15px 15px 0 0;
+ border-top: 1px solid #2f2e32;
text-align: justify;
+ line-height: 1.5em;
& h1 {
margin: 20px 0 0 0 0;
font-weight: bold;
@@ -46,7 +47,7 @@
& .dialog {
background: #ff0000;
color: #fff;
- padding: 2em 1em 2em 1em;
+ padding: 1em;
display: block;
font-size: 1.5rem;
margin: 1rem;
@@ -80,9 +81,12 @@
background: url(assets/page_footer.webp) no-repeat left bottom #E1D6CF;
min-width: 890px;
padding-bottom: 200px;
- border-radius: 15px 0 0 15px;
+ border: 1px solid #2f2e32;
+ border-right: none;
+ border-radius: 0 0 0 2.5ch;
& p {
- margin: 0px 40px 5px 30px;
+ margin-left: 30px;
+ margin-right: 40px;
}
}
}
diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue
index 7c92948..01fe36a 100644
--- a/src/components/Navigation.vue
+++ b/src/components/Navigation.vue
@@ -5,13 +5,13 @@
<ul>
<li><router-link :class="{ 'custom-active': isHome }" :to="{ name: 'home' }">Home</router-link></li>
<li><router-link :to="{ name: 'registration' }">Create Account</router-link></li>
- <li><a href="https://wiki.themanaworld.org/index.php/Downloads">Download</a></li>
+ <li><a href="https://wiki.themanaworld.org/wiki/Downloads">Download</a></li>
<li><router-link :to="{ name: 'about' }">About</router-link></li>
- <li><a href="https://wiki.themanaworld.org/index.php/FAQ">FAQ</a></li> <!-- we might want to put FAQ under About, or put About on the wiki -->
+ <li><a href="https://wiki.themanaworld.org/wiki/FAQ">FAQ</a></li> <!-- we might want to put FAQ under About, or put About on the wiki -->
<li><router-link :class="{ 'custom-active': isSupport }" :to="{ name: 'support' }">Support</router-link></li>
<li><a href="https://wiki.themanaworld.org/">Wiki</a></li>
<li><a href="https://forums.themanaworld.org/">Forums</a></li>
- <li><a href="https://policies.themanaworld.org/">Privacy, Policy & Rules</a></li>
+ <li><a href="https://policies.themanaworld.org/">Policies & Rules</a></li>
</ul>
</div>
<div class="server">
@@ -19,13 +19,13 @@
<ServerStatus class="status"/>
</div>
<div class="screenshots">
- <a href="https://wiki.themanaworld.org/index.php/Screenshots" title="Screenshots" aria-label="view screenshots">Screenshots</a>
+ <a href="https://wiki.themanaworld.org/wiki/Screenshots" title="Screenshots" aria-label="view screenshots">Screenshots</a>
</div>
<div>
<span>Source Code</span>
<ul>
<li><a href="https://git.themanaworld.org/explore/groups" aria-label="source code for The Mana World">The Mana World</a></li>
- <li><a href="https://github.com/bjorn/tiled" aria-label="source code for Tiled">Tiled</a></li>
+ <li><a href="https://github.com/mapeditor/tiled" aria-label="source code for Tiled">Tiled</a></li>
</ul>
</div>
</nav>
@@ -35,9 +35,8 @@
.nav {
background: #BA7A58;
color: #2f2e32;
- border-radius: 0 0 15px 15px;
- padding: 15px;
- font-size: 14px;
+ border-bottom: 1px solid #2f2e32;
+ padding: 1.25ch;
& .hamburger {
position: absolute;
@@ -54,34 +53,22 @@
background: #CBA083;
margin: 0;
padding: 0;
- border-radius: 5px;
+ border-radius: 1.25ch;
border: solid 1px #2f2e32;
- margin-bottom: 13px;
+ margin-bottom: 1.25ch;
min-width: max(160px, 17ch);
& ul {
list-style: none;
margin: 0;
- padding: 0;
-
- & li {
- margin-left: 0.8ch;
- margin-right: 0.8ch;
-
- &:first-of-type {
- margin-top: 0.8ch;
- }
-
- &:last-of-type {
- margin-bottom: 0.8ch;
- }
- }
+ padding: 0.75ch;
}
& span {
text-align: center;
+ font-size: 0.9em;
display: block;
- padding: 5px;
+ padding: 0.5ch;
border-bottom: solid 1px #2f2e32;
}
@@ -90,7 +77,8 @@
text-decoration: none;
display: block;
border: solid 1px #CBA083;
- padding: 1ch;
+ border-radius: 0.5ch;
+ padding: 0.75ch 1ch;
&:is(:hover, :focus), &.router-link-exact-active, &.custom-active {
background-color: rgba(255,255,255,0.4);
@@ -103,7 +91,7 @@
text-align: center;
font-weight: bolder;
border: 0;
- border-radius: 0 0 5px 5px;
+ border-radius: 0 0 1.25ch 1.25ch;
&:hover {
background-color: rgba(255,255,255,0.4);
@@ -129,7 +117,8 @@
@media (min-width: 1100px) {
.nav {
- border-radius: 0 15px 15px 0;
+ border-radius: 0 2.5ch 2.5ch 0;
+ border: 1px solid #2f2e32;
& .hamburger {
display: none;
diff --git a/src/router/redirects.ts b/src/router/redirects.ts
index 0671f9c..170f35f 100644
--- a/src/router/redirects.ts
+++ b/src/router/redirects.ts
@@ -20,7 +20,7 @@ const redirects = [
{
path: "/downloads.php",
redirect: (): void => {
- self.location.href = "https://manaplus.germantmw.de/";
+ self.location.href = "https://wiki.themanaworld.org/wiki/Downloads";
}
},
{
diff --git a/src/views/About.vue b/src/views/About.vue
index 68e3e72..da92d47 100644
--- a/src/views/About.vue
+++ b/src/views/About.vue
@@ -13,9 +13,9 @@
<p>We are volunteer driven and encourage player participation in development. We have a long history of contributors. We try to make contributing to the game easy.</p>
<p>
<ul>
- <li><a href="https://wiki.themanaworld.org/index.php/TMW_Team">TMW Team</a></li>
+ <li><a href="https://wiki.themanaworld.org/wiki/TMW_Team">TMW Team</a></li>
<li><a href="https://gitlab.com/groups/evol/-/group_members">Current contributors</a></li>
- <li><a href="https://wiki.themanaworld.org/index.php/Dev:Contributors">Past contributors</a></li>
+ <li><a href="https://wiki.themanaworld.org/wiki/Development:Contributors">Past contributors</a></li>
</ul>
</p>
</main>
diff --git a/src/views/Home.vue b/src/views/Home.vue
index b0a7b11..e9740bf 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -3,13 +3,13 @@
<h1>The Mana World Project</h1>
<p>The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG. TMW uses 2D graphics and aims to create a large and diverse interactive world. It is licensed under the GPL, making sure this game can't ever run away from you.</p>
<div class="read-more">
- <router-link :to="{ name: 'about' }">Read More >></router-link>
+ <router-link :to="{ name: 'about' }">Read More &raquo;</router-link>
</div>
<h1>Recent News</h1>
<News :count="1"/>
<div class="read-more">
- <router-link :to="{ name: 'news' }">More News >></router-link>
+ <router-link :to="{ name: 'news' }">More News &raquo;</router-link>
</div>
</main>
</template>
@@ -23,7 +23,7 @@
color: #2f2e32;
text-decoration: none;
font-weight: bold;
- font-size: 0.8em;
+ font-size: 0.9em;
&:hover {
text-decoration: underline;
diff --git a/src/views/Migration.vue b/src/views/Migration.vue
index f557d3e..c68989c 100644
--- a/src/views/Migration.vue
+++ b/src/views/Migration.vue
@@ -166,8 +166,6 @@ export default class Recovery extends Vue {
}
console.log("Captcha OK")
- // ${process.env.VUE_APP_API}
- // https://api.themanaworld.org/api
const req = new Request(`${process.env.VUE_APP_PYAPI}/tmwa_auth`, {
method: "POST",
mode: "no-cors",
diff --git a/src/views/Registration.vue b/src/views/Registration.vue
index c663143..86bb5a4 100644
--- a/src/views/Registration.vue
+++ b/src/views/Registration.vue
@@ -2,7 +2,7 @@
<main class="registration">
<h1>Account creation</h1>
<p>Welcome to The Mana World! With this form you can register for a new game account.</p>
- <p>Please note that you will also need to download and install <a href="https://manaplus.germantmw.de/" target="_blank">ManaPlus</a>, our official game client.</p>
+ <p>Please note that you will also need to <a href="https://wiki.themanaworld.org/wiki/Downloads" target="_blank">install a suitable client</a> to play this game.</p>
<br>
<div class="dialog">
<b>NOTICE:</b> Accounts may take up to 15 minutes for automatic activation. No email confirmation is necessary.