Skip to content

Commit e334fa3

Browse files
dave2wavedave2wave
authored
Menu adjustments (#79)
* Menu adjustments * Adjust width of main content body * Adjust top * Update menu.html * Separate the two top navbars * Adjust when hamburger appears
1 parent f0c6231 commit e334fa3

5 files changed

Lines changed: 28 additions & 36 deletions

File tree

‎content/theme/templates/blogindex.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div id="contents">
22
<div class="bg-white p-5 rounded">
3-
<div class="col-sm-8 mx-auto">
3+
<div class="col-sm-12 mx-auto">
44

55
<h3>Welcome to the Tooling Blog!</h3>
66
<p><i>Here you will find tooling updates</i></p>

‎content/theme/templates/frontpage.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- page contents -->
22
<div id="contents">
33
<div class="bg-white p-5 rounded">
4-
<div class="col-sm-8 mx-auto">
4+
<div class="col-sm-12 mx-auto">
55
{{ page.content }}
66
</div>
77
</div>

‎content/theme/templates/generic.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- page contents -->
22
<div id="contents">
33
<div class="bg-white p-5 rounded">
4-
<div class="col-sm-8 mx-auto">
4+
<div class="col-sm-12 mx-auto">
55
<h1>
66
{% if article %}
77
{{ article.title }}

‎content/theme/templates/menu.html‎

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- nav bar -->
2-
<nav class="navbar navbar-expand-lg navbar-light bg-info fixed-top" aria-label="Fifth navbar example">
2+
<nav class="navbar navbar-expand-md navbar-light bg-info fixed-top" aria-label="Fifth navbar example">
33
<div class="container-fluid">
44
<a class="navbar-brand" href="/">
55
<img src="https://apache.org/img/asf_logo.png" alt="The Apache Software Foundation" style="height: 42px;">
@@ -8,30 +8,30 @@
88
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarADP" aria-controls="navbarADP" aria-expanded="false" aria-label="Toggle navigation">
99
<span class="navbar-toggler-icon"></span>
1010
</button>
11-
1211
<div class="collapse navbar-collapse" id="navbarADP" style="position: relative; top: 4px; margin-left: 16px;">
13-
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
12+
<ul class="navbar-nav me-auto">
1413
<li class="nav-item dropdown">
15-
<a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Team</a>
14+
<a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">About</a>
1615
<ul class="dropdown-menu">
1716
<!--<li><a class="dropdown-item" href="/blog/">Tooling Blog</a></li>-->
1817
<li><a class="dropdown-item" href="/team.html">About the team</a></li>
18+
<li><a class="dropdown-item" href="/volunteer.html">Volunteer with Tooling</a></li>
19+
<li><a class="dropdown-item" href="/job-posting.html">Job Posting</a></li>
20+
<li><hr class="dropdown-divider"></li>
1921
<li><a class="dropdown-item" href="/trusted-releases.html">Trusted Releases</a></li>
2022
<li><a class="dropdown-item" href="/supply-chain.html">Supply Chain Attacks FAQ</a></li>
2123
<li><a class="dropdown-item" href="/policies.html">Policies</a></li>
2224
</ul>
2325
</li>
24-
2526
<li class="nav-item dropdown">
2627
<a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Tools</a>
2728
<ul class="dropdown-menu">
2829
<li><a class="dropdown-item" href="https://release-test.apache.org/">Trusted Releases Alpha</a></li>
2930
<li><a class="dropdown-item" href="https://agenda.apache.org">Board Agenda Tool</a></li>
3031
</ul>
3132
</li>
32-
3333
<li class="nav-item dropdown">
34-
<a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Repositories</a>
34+
<a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Source</a>
3535
<ul class="dropdown-menu">
3636
<li><a class="dropdown-item" href="https://github.com/apache/tooling-docs/">Documentation Website</a></li>
3737
<li><a class="dropdown-item" href="https://github.com/apache/tooling-secretary">Secretary's Workbench</a></li>
@@ -41,15 +41,6 @@
4141
<li><a class="dropdown-item" href="https://github.com/apache/tooling-agenda">Agenda Tool</a></li>
4242
</ul>
4343
</li>
44-
45-
<li class="nav-item dropdown">
46-
<a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">Contribute</a>
47-
<ul class="dropdown-menu">
48-
<li><a class="dropdown-item" href="/volunteer.html">Volunteer with Tooling</a></li>
49-
<li><a class="dropdown-item" href="/job-posting.html">Job Posting</a></li>
50-
</ul>
51-
</li>
52-
5344
<li class="nav-item dropdown">
5445
<a href="#" class="nav-link dropdown-toggle hidden-xs" data-bs-toggle="dropdown"><span class="fa-solid fa-magnifying-glass" aria-hidden="true"></span> Search</a>
5546
<ul class="search-form dropdown-menu">
@@ -59,22 +50,23 @@
5950
</ul>
6051
</li>
6152
</ul>
62-
<div class="nav-item dropdown active">
63-
<a class="nav-link dropdown-toggle" href="#"
64-
role="button" data-bs-toggle="dropdown" aria-expanded="false">
65-
About The ASF
66-
</a>
67-
<div class="dropdown-menu dropdown-menu-end">
68-
<a class="dropdown-item" href="https://www.apache.org/">Foundation</a>
69-
<div class="dropdown-divider"></div>
70-
<a class="dropdown-item" href="https://www.apache.org/licenses/">License</a>
71-
<a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
72-
<a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
73-
<div class="dropdown-divider"></div>
74-
<a class="dropdown-item" href="https://www.apache.org/security/">Security</a>
75-
<a class="dropdown-item" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy Policy</a>
76-
</div>
77-
</div>
53+
<ul class="navbar-nav">
54+
<li class="nav-item dropdown">
55+
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
56+
About The ASF
57+
</a>
58+
<ul class="dropdown-menu dropdown-menu-end">
59+
<li><a class="dropdown-item" href="https://www.apache.org/">Foundation</a></li>
60+
<li><hr class="dropdown-divider"></li>
61+
<li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
62+
<li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
63+
<li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
64+
<li><hr class="dropdown-divider"></li>
65+
<li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
66+
<li><a class="dropdown-item" href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy Policy</a></li>
67+
</ul>
68+
</li>
69+
</ul>
7870
</div>
7971
</div>
8072
</nav>

‎content/theme/templates/styles.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<!-- pagefind search box styling -->
2929
<style>
3030
body {
31-
padding-top: 56px;
31+
padding-top: 44px;
3232
}
3333
.search-form {
3434
right: 0;

0 commit comments

Comments
 (0)