Skip to content

Commit fa0e64d

Browse files
EveStarLITEEveStarLITE
committed
mend
1 parent af27abf commit fa0e64d

File tree

3 files changed

+70
-47
lines changed

3 files changed

+70
-47
lines changed

‎archives/index.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<header id="navbar">
1313
<ul>
1414
<li>
15-
<a href="../">Home</a>
15+
<a href="/" class="active">Archives</a>
1616
</li>
1717
<li>
1818
<a href="../admin/">Admin</a>
@@ -21,16 +21,17 @@
2121
<a href="../bootstrap/">Developer Bootstrap</a>
2222
</li>
2323
<li>
24-
<a href="../vpn/">VPN Setup</a>
24+
<a href="../">Home</a>
2525
</li>
2626
<li>
2727
<a href="../ci/">Curriculum</a>
2828
</li>
2929
<li>
30-
<a href="../fll/">FLL</a>
30+
<a href="../vpn/">VPN Setup</a>
3131
</li>
32+
3233
<li>
33-
<a href="./" class="active">Archives</a>
34+
<a href="../fll/">FLL</a>
3435
</li>
3536
</ul>
3637
</header>

‎index.html

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,31 @@
1111
</head>
1212
<body>
1313
<header id="navbar">
14-
<ul>
15-
<li>
16-
<a href="/" class="active">Home</a>
17-
</li>
18-
<li>
19-
<a href="admin/">Admin</a>
20-
</li>
21-
<li>
22-
<a href="bootstrap/">Developer Bootstrap</a>
23-
</li>
24-
<li>
25-
<a href="vpn/">VPN Setup</a>
26-
</li>
27-
<li>
28-
<a href="ci/">Curriculum</a>
29-
</li>
30-
<li>
31-
<a href="fll/">FLL</a>
32-
</li>
33-
<li>
34-
<a href="archives/">Archives</a>
35-
</li>
36-
</ul>
37-
</header>
14+
<ul>
15+
<li>
16+
<a href="archives/">Archives</a>
17+
</li>
18+
<li>
19+
<a href="admin/">Admin</a>
20+
</li>
21+
<li>
22+
<a href="bootstrap/">Developer Bootstrap</a>
23+
</li>
24+
<li>
25+
<a href="/">Home</a>
26+
</li>
27+
<li>
28+
<a href="ci/">Curriculum</a>
29+
</li>
30+
<li>
31+
<a href="vpn/">VPN Setup</a>
32+
</li>
33+
34+
<li>
35+
<a href="fll/">FLL</a>
36+
</li>
37+
</ul>
38+
</header>
3839
<div class="body">
3940
<h1>FRC 3512 Software Team</h1>
4041
<div class="Info">
@@ -95,39 +96,41 @@ <h2 id="What_students_will_learn">What Students Learn</h2>
9596
</div>
9697
</div>
9798
<script src="Collapse.js"></script>
98-
<div class="Direct_links">
99+
<div class="Contain_links">
100+
<div class="Direct_links_1">
99101
<h2 id="Administration"><a href="admin/">Administration</a></h2>
100102
<p>Describes the software team's goals, its organization, and how it's
101103
run.</p>
102104
</div>
103-
<div class="Direct_links">
105+
<div class="Direct_links_1">
104106
<h2 id="Developer_bootstrap"><a href="bootstrap/">Developer
105107
bootstrap</a></h2>
106108
<p>Provides the necessary tools to begin programming in C++.</p>
107109
</div>
108-
<div class="Direct_links">
110+
<div class="Direct_links_1">
109111
<h2 id="VPN_setup"><a href="vpn/">VPN setup</a></h2>
110112
<p>Instructions for connecting to our robot VPN.</p>
111113
</div>
112-
<div class="Direct_links">
114+
<div class="Direct_links_1">
113115
<h2 id="Curriculum_and_instruction"><a href="ci/">Curriculum and
114116
instruction</a></h2>
115117
<p>Contains the software team teaching materials.</p>
116118
</div>
117-
<div class="Direct_links">
119+
<div class="Direct_links_1">
118120
<h2 id="GitHub"><a href="https://github.com/frc3512/">GitHub</a></h2>
119121
<p>The software team's GitHub organization, which contains mirrors of our
120122
Git repositories.</p>
121123
</div>
122-
<div class="Direct_links">
124+
<div class="Direct_links_1">
123125
<h2 id="FLL"><a href="fll/">FLL</a></h2>
124126
<p>FLL-related stuff the software team deals with on an annual basis.</p>
125127
</div>
126-
<div class="Direct_links">
128+
<div class="Direct_links_2">
127129
<h2 id="Archives"><a href="archives/">Archives</a></h2>
128130
<p>Contains legacy projects and resources from throughout the team's
129131
history.</p>
130132
</div>
133+
</div>
131134
</div>
132135
</body>
133-
</html>
136+
</html>

‎main.css

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,31 +91,24 @@ summary.curriculum:hover {
9191

9292
#navbar {
9393
width: 100%;
94-
background-color: darkblue;
94+
background-color: rgb(0, 0, 138);
9595
overflow: auto;
9696
margin: auto;
97-
position: fixed;
97+
position: relative;
9898
top: 0;
9999
}
100100

101101
#navbar a {
102102
float: left;
103-
padding: 0.4em 0.8em 0.4em 0.8em;
103+
padding: 0.4em 2.5em 0.4em 2.5em;
104104
color: white;
105105
text-decoration: none;
106106
font-size: 1em;
107107
}
108108

109109
#navbar li {
110110
list-style: none;
111-
}
112-
113-
#navbar a:hover {
114-
color: lightblue;
115-
}
116-
117-
#navbar ul li a.active {
118-
color: lightslategray;
111+
text-align: center;
119112
}
120113

121114
@media screen and (max-width: 44em) {
@@ -153,4 +146,30 @@ summary.curriculum:hover {
153146
display: none;
154147
overflow: hidden;
155148
background-color: #f1f1f1;
149+
}
150+
151+
.collapsible {
152+
text-align: center;
153+
}
154+
155+
div.Contain_links{
156+
display: grid;
157+
grid-template-columns: 24rem 24rem;
158+
}
159+
160+
div.Direct_links_1 {
161+
border-style: outset;
162+
border-color: rgb(138, 146, 192);
163+
164+
width: 15rem;
165+
margin: 2rem;
166+
padding: 2rem;
167+
}
168+
169+
div.Direct_links_2 {
170+
border-style: outset;
171+
border-color: rgb(138, 146, 192);
172+
width: 40rem;
173+
margin: 1.5rem;
174+
padding: 2rem;
156175
}

0 commit comments

Comments
 (0)