Skip to content

Improve header and footer #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 17, 2020
+63 −46
Merged

Improve header and footer #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 30 additions & 23 deletions _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,17 @@
{% if page.url != "/" %}
<header>
<div id="header-inner">
<a class="site-title" href="{{ site.baseurl }}/">
<img src="/assets/rust-analyzer.svg" alt="rust analyzer" id="header-logo">
</a>
<a class="nav-link" href="https://opencollective.com/rust-analyzer/">Sponsor</a>
<a class="nav-link" href="/manual.html">Docs</a>
<a class="nav-link" href="/blog">Blog</a>
<a class="nav-link" href="/thisweek">Changelog</a>
<div id="header-left">
<a class="site-title" href="{{ site.baseurl }}/">
<img src="/assets/rust-analyzer.svg" alt="rust analyzer" id="header-logo">
</a>
</div>
<div id="header-right">
<a class="nav-link" href="https://opencollective.com/rust-analyzer/">Sponsor</a>
<a class="nav-link" href="/manual.html">Docs</a>
<a class="nav-link" href="/blog">Blog</a>
<a class="nav-link" href="/thisweek">Changelog</a>
</div>
</div>
</header>
{% endif %}
Expand All @@ -49,23 +53,26 @@
</main>

<footer>
<p id="footer-inner">
<span class="footer-by">
<div id="footer-inner">
<div class="footer-by">
<a href="https://ferrous-systems.com/">
<img class="ferrous-logo" src="/assets/ferrous-logo.png">
Ferrous Systems
</a> & <a href="https://github.com/rust-analyzer/rust-analyzer/graphs/contributors">contributors</a>
</span>
<a href="{{ '/feed.xml' | prepend: site.baseurl }}" class="footer-link">
<i class="fa fa-rss"></i> rss
</a>
<a href="https://github.com/rust-analyzer/rust-analyzer.github.io" class="footer-link">
<i class="fa fa-github"></i> src
</a>
<a href="https://opencollective.com/rust-analyzer/" class="footer-link">
<i class="fa fa-github"></i> sponsor
</a>
</p>
<img class="ferrous-logo" src="/assets/ferrous-logo.png">Ferrous Systems</a>
&
<a href="https://github.com/rust-analyzer/rust-analyzer/graphs/contributors">contributors</a>
</div>

<div id="footer-links">
<a href="{{ '/feed.xml' | prepend: site.baseurl }}" class="footer-link">
<i class="fa fa-rss"></i> rss
</a>
<a href="https://github.com/rust-analyzer/rust-analyzer.github.io" class="footer-link">
<i class="fa fa-github"></i> src
</a>
<a href="https://opencollective.com/rust-analyzer/" class="footer-link">
<i class="fa fa-github"></i> sponsor
</a>
</div>
</div>
</footer>
</body>

Expand Down
56 changes: 33 additions & 23 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,37 @@ header {
box-shadow: 0 0 7px rgba(0, 0, 0, 0.15);
}

#header-inner {
#header-inner, #footer-inner {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: stretch;
width: 100%;
max-width: 80ch;
padding: 1ch;
padding: 1ch 0;
margin: 0 auto;
}

#header-left, #header-right, #footer-links {
display: flex;
margin: 0 1ch;
flex-wrap: wrap;
align-content: center;
justify-content: center;
line-height: 2rem;
}

#header-logo {
display: block;
width: calc(17vw + 4rem);
max-width: 200px;
margin-right: 0.4rem;
}

#header-logo:hover, #header-logo:focus {
opacity: 0.8;
}

a.nav-link, a.site-title {
a.nav-link, a.site-title, a.footer-link {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}

Expand All @@ -45,7 +51,7 @@ a.nav-link {
font-style: normal;
color: rgba(0, 0, 0, .8);
text-decoration: none;
border-radius: 4px;
padding: 0 10px;
}

a.nav-link:hover {
Expand All @@ -68,26 +74,14 @@ main {

footer {
width: 100%;
padding: 2ch;
text-align: center;
margin-top: 1rem;
box-shadow: 0 0 7px rgba(0, 0, 0, 0.15);
}

#footer-inner {
display: flex;
flex-wrap: wrap;
width: 100%;
max-width: 80ch;
margin: 0 auto;
}

.footer-by {
margin-right: auto;
}

footer p {
margin: 0;
margin: 0 1ch;
padding: 10px 0;
text-align: center;
}

.ferrous-logo {
Expand All @@ -103,6 +97,7 @@ footer p {
white-space: nowrap;
}
.footer-link > .fa {
margin-right: 0.4em;
color: rgba(0, 0, 0, .8)
}
footer > p {
Expand Down Expand Up @@ -186,3 +181,18 @@ a.source:hover {
.post-link:hover {
text-decoration: underline;
}

@media (max-width: 600px) {
#header-inner {
flex-direction: column;
padding: 1ch 0 0 0;
}

a.nav-link {
padding: 0 5px;
}

#footer-inner {
flex-direction: column;
}
}