Skip to content

Commit 475a16e

Browse files
iveurneiveurne
authored
Merge pull request #6 from iveurne/main
new navbar & small changes (by @KingMayro)
2 parents 3754ec4 + 542476f commit 475a16e

File tree

10 files changed

+136
-60
lines changed

10 files changed

+136
-60
lines changed

‎www/404.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
</head>
99
<body>
1010
<header>
11-
<img src="assets/404.png" alt="Not found!" class="not-found" width=260px>
11+
<img src="assets/404.png" alt="Not found!" class="not-found" width="260px">
1212
</header>
1313
<main>
1414
<section>
1515
<center>
1616
<h2>Page not found!</h2>
17-
<p>Are you sure this is a real page?<br>
18-
What are you even doing here...????</p>
17+
<p>Oops, that page was not found!<br>
18+
Maybe you got a little lost...</p>
1919
<div class="download-buttons">
20-
<a href="./" class="btn">Go Back</a>
20+
<a href="./" class="btn">Return Home</a>
2121
</div>
2222
</section>
2323
</main>

‎www/guide.html‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
<header>
1212
<div class="logo">
1313
<img src="assets/netpasslogo.png" alt="NetPass' logo">
14-
</div>
15-
</header>
16-
<nav>
17-
<ul>
18-
<li><a href="./">Go Back</a></li>
19-
</ul>
20-
</nav>
21-
</header>
14+
</div>
15+
</header>
16+
17+
<div class="flexreturn">
18+
<a class="navbarbutton returnrounded" href="index.html"><div class="textcentermid">Return Home</div></a>
19+
</div>
20+
2221
<main>
2322
<section id="installation-guide">
2423
<h2>Installation Guide</h2>

‎www/index.html‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<meta property="og:title" content="NetPass">
7-
<meta property="og:description" content="StreetPass revival service for the Nintendo 3DS!">
7+
<meta property="og:description" content="A StreetPass revival service for the Nintendo 3DS!">
88
<meta property="og:image" content="https://netpass.cafe/assets/favicon_netpass.png">
99
<meta property="#37B381" data-react-helmet="true" name="theme-color" />
1010
<title>NetPass - StreetPass in the modern world!</title>
@@ -19,14 +19,14 @@
1919
<img src="assets/netpasslogo.png" alt="NetPass' logo">
2020
</div>
2121
</header>
22-
<nav>
23-
<ul>
24-
<li><a href="install.html">Install</a></li>
25-
<li><a href="guide.html">Guide</a></li>
26-
<li><a href="#community">Community</a></li>
27-
<li><a href="login.html">Login</a></li>
28-
</ul>
29-
</nav>
22+
23+
<div class="flex">
24+
<a class="navbarbutton navstart" href="install.html"><div class="textcentermid">Install</div></a>
25+
<a class="navbarbutton" href="guide.html"><div class="textcentermid">Guide</div></a>
26+
<a class="navbarbutton" href="index.html#community"><div class="textcentermid">Community</div></a>
27+
<a class="navbarbutton navend" href="login.html"><div class="textcentermid">Login</div></a>
28+
</div>
29+
3030
<main>
3131
<section id="section">
3232
<h2>What is NetPass?</h2>
@@ -38,7 +38,6 @@ <h2>What is NetPass?</h2>
3838
<p>
3939
Unlike StreetPass, NetPass works over the internet. Upon opening NetPass, you can pick various locations to go to and get passes of others who are in the same location, meanwhile others who enter that location can get passes with you!
4040
</p>
41-
</p>
4241
</section>
4342
<section id="community">
4443
<h2>Community</h2>

‎www/install.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>NetPass - Guide</title>
7+
<title>NetPass - Install</title>
88
<link rel="stylesheet" href="styles.css">
99
<link rel="icon" href="assets/favicon_netpass.png" type="image/png">
1010
<link rel="stylesheet" href="assets/fontawesome/css/all.min.css">
@@ -16,11 +16,11 @@
1616
<img src="assets/netpasslogo.png" alt="NetPass' logo">
1717
</div>
1818
</header>
19-
<nav>
20-
<ul>
21-
<li><a href="./">Go Back</a></li>
22-
</ul>
23-
</nav>
19+
20+
<div class="flexreturn">
21+
<a class="navbarbutton returnrounded" href="index.html"><div class="textcentermid">Return Home</div></a>
22+
</div>
23+
2424
</header>
2525
<main>
2626
<section id="requirements">

‎www/login.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
<img src="assets/netpasslogo.png" alt="NetPass' logo">
1414
</div>
1515
</header>
16-
<nav>
17-
<ul>
18-
<li><a href="./">Go Back</a></li>
19-
</ul>
20-
</nav>
16+
17+
<div class="flexreturn" style="margin-bottom:20px;">
18+
<a class="navbarbutton returnrounded" href="index.html"><div class="textcentermid">Return Home</div></a>
19+
</div>
20+
2121
<section id="login">
2222
<h2>Login</h2>
2323
<p>Chose a method to log in with</p>

‎www/login_3ds.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
<img src="assets/netpasslogo.png" alt="NetPass' logo">
1414
</div>
1515
</header>
16-
<nav>
17-
<ul>
18-
<li><a href="./">Go Back</a></li>
19-
</ul>
20-
</nav>
16+
17+
<div class="flexreturn" style="margin-bottom:20px;">
18+
<a class="navbarbutton returnrounded" href="index.html"><div class="textcentermid">Return Home</div></a>
19+
</div>
20+
2121
<section id="login">
2222
<h2>Login with Nintendo 3DS</h2>
2323
<div class="qr-container">

‎www/privacy.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<img src="assets/netpasslogo.png" alt="NetPass' logo">
1515
</div>
1616
</header>
17-
<nav>
18-
<ul>
19-
<li><a href="./">Go back</a></li>
20-
</ul>
21-
</nav>
17+
18+
<div class="flexreturn">
19+
<a class="navbarbutton returnrounded" href="index.html"><div class="textcentermid">Return Home</div></a>
20+
</div>
21+
2222
<main>
2323
<section>
2424
<h2>NetPass Privacy Policy</h2>
@@ -96,4 +96,4 @@ <h2>Contact</h2>
9696

9797
</footer>
9898
</body>
99-
</html>
99+
</html>

‎www/rules.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<img src="assets/netpasslogo.png" alt="NetPass' logo">
1515
</div>
1616
</header>
17-
<nav>
18-
<ul>
19-
<li><a href="index.html">Go back</a></li>
20-
</ul>
21-
</nav>
17+
18+
<div class="flexreturn">
19+
<a class="navbarbutton returnrounded" href="index.html"><div class="textcentermid">Return Home</div></a>
20+
</div>
21+
2222
<main>
2323
<section id="rules">
2424
<h2>Rules</h2>

‎www/styles.css‎

Lines changed: 83 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body {
66
background-attachment: fixed;
77
color: #20834C;
88
transition: background 0.3s, color 0.3s;
9-
font-family: rodin, sans-serif;
9+
font-family: rodin, arial;
1010
}
1111

1212
header {
@@ -36,7 +36,7 @@ nav ul {
3636
text-align: center;
3737
background-color: #38AAB0;
3838
font-size: 1.2em;
39-
font-family: seurat, sans-serif;
39+
font-family: seurat, arial;
4040
display: flex;
4141
justify-content: center;
4242
}
@@ -45,14 +45,12 @@ nav ul li {
4545
top: 20px;
4646
display: inline;
4747
padding: 10px;
48-
font-family: seurat, sans-serif;
4948
}
5049

5150
nav ul li a {
5251
top: 20px;
5352
color: white;
5453
text-decoration: none;
55-
font-family: seurat, sans-serif;
5654
}
5755

5856
main {
@@ -66,7 +64,7 @@ section {
6664
background: #37B381;
6765
background: linear-gradient( #ffffff, #e2f8ec);
6866
margin-bottom: 40px;
69-
font-family: rodin, sans-serif;
67+
font-family: rodin, arial;
7068
}
7169

7270
h2 {
@@ -84,6 +82,7 @@ h2 {
8482
border-radius: 30px;
8583
font-family: seurat;
8684
border: 0;
85+
transition: ease-in-out 0.1s;
8786
}
8887

8988
.txt {
@@ -194,3 +193,82 @@ img {
194193
font-family: seurat;
195194
src: url(fonts/seurat.otf);
196195
}
196+
197+
198+
199+
.flex, .flexreturn {
200+
display:flex;
201+
font-family: seurat, arial;
202+
background-color: #20834CBD;
203+
border-radius:200px;
204+
width:700px;
205+
margin: 20px auto 0;
206+
}
207+
208+
.flexreturn {
209+
width:200px;
210+
}
211+
212+
.navbarbutton {
213+
background-color: #37b381;
214+
height:42px;
215+
font-size:19px;
216+
width:172px;
217+
flex-grow:2;
218+
transition: ease-in-out 0.1s;
219+
margin: 0 2px;
220+
}
221+
222+
.returnrounded {
223+
border-radius:200px;
224+
margin:0 !important;
225+
}
226+
227+
.navstart {
228+
border-radius:200px 0 0 200px;
229+
margin-left:0;
230+
}
231+
232+
.navend {
233+
border-radius:0 200px 200px 0;
234+
margin-right:0;
235+
}
236+
237+
.flex a, .flexreturn a {
238+
color:white;
239+
text-decoration:none;
240+
}
241+
242+
.textcentermid {
243+
text-align:center;
244+
}
245+
246+
.navbarbutton:hover {
247+
background-color: #1dad77;
248+
249+
}
250+
251+
@media (max-width:800px) {
252+
253+
.flex {
254+
width:85%;
255+
}
256+
257+
}
258+
259+
@media (max-width:600px) {
260+
261+
.navbarbutton {
262+
width:auto;
263+
padding:0 2px;
264+
}
265+
266+
}
267+
268+
@media (max-width:480px) {
269+
270+
.flex {
271+
width:95%;
272+
}
273+
274+
}

‎www/user.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
<div class="logo">
1717
<img src="assets/netpasslogo.png" alt="NetPass' logo">
1818
</header>
19-
<nav>
20-
<ul>
21-
<li><a href="./">Go Back</a></li>
22-
</ul>
23-
</nav>
19+
20+
<div class="flexreturn" style="margin-bottom:20px;">
21+
<a class="navbarbutton returnrounded" href="index.html"><div class="textcentermid">Return Home</div></a>
22+
</div>
23+
2424
<section id="user">
2525
<h2><i class="fa-solid fa-user"></i> User <span id="username"></span></h2>
2626
<p>You are logged in!</p>
@@ -48,4 +48,4 @@ <h2><i class="fa-solid fa-gamepad"></i> Linked consoles</h2>
4848
</section>
4949
</body>
5050

51-
</html>
51+
</html>

0 commit comments

Comments
 (0)