Skip to content

Commit a612917

Browse files
committed
Merge branch 'multiplayer' into main
2 parents 43f8c9b + 851f1ce commit a612917

35 files changed

+5914
-3804
lines changed

static/about.html renamed to client/about.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<meta charset="utf-8">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88

9-
<link rel="icon" type="image/x-icon" href="/static/favicon.ico">
10-
<link rel="stylesheet" href="/bootstrap.css">
11-
<script src="/bootstrap.bundle.min.js"></script>
9+
<link rel="icon" type="image/x-icon" href="/favicon.ico">
10+
<link rel="stylesheet" href="/bootstrap/bootstrap.css">
11+
<script src="/bootstrap/bootstrap.bundle.min.js"></script>
1212
</head>
1313

1414
<body>
@@ -23,16 +23,19 @@
2323
<div class="collapse navbar-collapse" id="navbarSupportedContent">
2424
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
2525
<li class="nav-item">
26-
<a class="nav-link" href="/tossups.html">Tossups</a>
26+
<a class="nav-link" href="/tossups">Tossups</a>
2727
</li>
2828
<li class="nav-item">
29-
<a class="nav-link" href="/bonuses.html">Bonuses</a>
29+
<a class="nav-link" href="/bonuses">Bonuses</a>
30+
</li>
31+
<li class="nav-item">
32+
<a class="nav-link" href="/multiplayer">Multiplayer</a>
3033
</li>
3134
</ul>
3235
<div class="d-flex">
3336
<ul class="navbar-nav mb-2 mb-lg-0">
3437
<li class="nav-item">
35-
<a class="nav-link active" aria-current="page" href="#">About</a>
38+
<a class="nav-link active" aria-current="page" href="/about">About</a>
3639
</li>
3740
</ul>
3841
</div>

0 commit comments

Comments
 (0)