Skip to content

Commit 7a0cb2a

Browse files
alexlambsonalexlambson
committed
- Add some navigation
- Make page widths consistent and sane
1 parent afcaf0f commit 7a0cb2a

File tree

4 files changed

+50
-25
lines changed

4 files changed

+50
-25
lines changed

‎kirovy/templates/legacy_outer.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@
1313
<body>
1414
<div id="flex-main">
1515
<div id="flex-container">
16-
<div id="header">
16+
<div id="header" class="use-width">
1717
<a class="navbar-brand" href="http://cncnet.org" title="CnCNet Home">
1818
<img src="https://cncnet.org/build/assets/logo-ad41e578.svg" alt="CnCNet logo" loading="lazy" class="logo-full">
1919
<span class="logo-tagline">
2020
Keeping C&amp;C Alive Since 2009
2121
</span>
2222
</a>
23+
<div class="navbar">
24+
<a href="/search" title="CnCNet Legacy Map Search">Search</a>
25+
<a href="/upload-manual" title="CnCNet Legacy Map Upload">Upload</a>
26+
</div>
2327
<h1>{% block header_text %}404{% endblock %}</h1>
2428
</div>
2529
<div id="content">

‎kirovy/templates/legacy_search.html‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,26 @@
55
{% block header_text %}CnCNet Map Search{% endblock %}
66

77
{% block wrapped_content %}
8-
<div class="use-width"></div>
9-
<div class="form-wrapper">
10-
<h2>Search Options</h2>
11-
<form action="/search" method="post" enctype="multipart/form-data">
8+
<div class="form-wrapper limit-w-1000">
9+
<h2>Search Options</h2>
10+
<form action="/search" method="post" enctype="multipart/form-data">
11+
<div>
1212
<div>
13-
<div>
14-
<label for="game-slug">Game</label>
15-
<select id="game-slug" name="game">
16-
<option value="td" selected="selected">Command &amp; Conquer (Tiberian Dawn)</option>
17-
<option value="ra" selected="selected">Red Alert 1</option>
18-
<option value="d2" selected="selected">Dune 2000</option>
19-
<option value="ts" selected="selected">Tiberian Sun</option>
20-
<option value="yr" selected="selected">Yuri's Revenge</option>
21-
</select>
22-
</div>
23-
<div>
24-
<label for="map-name-or-description">Search text</label>
25-
<input type="text" id="map-name-or-description" name="map-name-or-description">
26-
</div>
13+
<label for="game-slug">Game</label>
14+
<select id="game-slug" name="game">
15+
<option value="td" selected="selected">Command &amp; Conquer (Tiberian Dawn)</option>
16+
<option value="ra" selected="selected">Red Alert 1</option>
17+
<option value="d2" selected="selected">Dune 2000</option>
18+
<option value="ts" selected="selected">Tiberian Sun</option>
19+
<option value="yr" selected="selected">Yuri's Revenge</option>
20+
</select>
2721
</div>
28-
<button class="full-width-flex-row btn" type="submit">Search</button>
29-
</form>
30-
</div>
22+
<div>
23+
<label for="map-name-or-description">Search text</label>
24+
<input type="text" id="map-name-or-description" name="map-name-or-description">
25+
</div>
26+
</div>
27+
<button class="full-width-flex-row btn" type="submit">Search</button>
28+
</form>
29+
</div>
3130
{% endblock %}

‎kirovy/templates/map_legacy_upload_ui.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
{% block header_text %}CnCNet 5 client upload test form{% endblock %}
66

77
{% block wrapped_content %}
8+
<div class="limit-w-1000">
89
<p>
910
Select a <span class="inline-code"><span class="it">&lt;sha1&gt;</span>.zip</span> from your file system.
1011
It should contain the <span class="inline-code">.mpr</span> file for
@@ -42,4 +43,5 @@
4243
</form>
4344
</div>
4445
<p>The CnCNet client will function <strong>exactly</strong> like this form.</p>
46+
</div>
4547
{% endblock %}

‎static/bc-assets/bc-main.css‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ body {
2222

2323
#header {
2424
flex-direction: row;
25-
flex-grow: 1;
2625
display: flex;
2726
align-items: center;
2827
height: 65px;
@@ -36,8 +35,8 @@ body {
3635
text-align-last: right;
3736
}
3837

39-
#header > * {
40-
flex: 1 1 auto;
38+
#header > :last-child {
39+
flex-grow: 1;
4140
}
4241

4342
.navbar-brand {
@@ -50,6 +49,21 @@ body {
5049
font-size: 1.25rem;
5150
}
5251

52+
.navbar > a {
53+
color: #ffffff;
54+
text-transform: uppercase;
55+
font-weight: bold;
56+
font-size: 1.2rem;
57+
transition: all ease .35s;
58+
text-decoration: none;
59+
padding: 1rem;
60+
margin: 0 .5rem;
61+
}
62+
63+
.navbar > a:hover {
64+
color: #33ffa1;
65+
}
66+
5367
.navbar-brand img {
5468
max-width: unset;
5569
}
@@ -118,6 +132,12 @@ form {
118132
width: 1400px;
119133
}
120134

135+
.limit-w-1000 {
136+
max-width: 1000px;
137+
margin-left: auto;
138+
margin-right: auto;
139+
}
140+
121141

122142
form > div {
123143
display: flex;

0 commit comments

Comments
 (0)