Skip to content
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.

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

Switch from Font Awesome 4 to 5 #100

Merged
merged 1 commit into from
Oct 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
<meta name="description" content="{{ site.description }}">

<link rel="stylesheet" href="{{ site.baseurl }}/css/bootstrap.css">
<link rel="stylesheet" href="{{ site.baseurl }}/css/font-awesome.min.css">
<link rel="stylesheet" href="{{ site.baseurl }}/css/fontawesome/solid.min.css">
<link rel="stylesheet" href="{{ site.baseurl }}/css/fontawesome/brands.min.css">
<link rel="stylesheet" href="{{ site.baseurl }}/css/fontawesome/fontawesome.min.css">
<link rel="stylesheet" href="{{ site.baseurl }}/css/style.css">

</head>
Expand All @@ -26,7 +28,7 @@
<li><a href="/docs">Documentation</a></li>
<li><a href="https://www.npmjs.com/search?q=keywords%3Athelounge-theme">Themes</a></li>
<li><a href="https://github.com/thelounge" title="GitHub Organization for The Lounge">
<i class="fa fa-github fa-2x" aria-hidden="true"></i>
<i class="fab fa-github fa-lg" aria-hidden="true"></i>
</a></li>
</ul>
</div>
Expand Down
4 changes: 0 additions & 4 deletions css/font-awesome.min.css

This file was deleted.

5 changes: 5 additions & 0 deletions css/fontawesome/brands.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions css/fontawesome/fontawesome.min.css

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions css/fontawesome/solid.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ pre code {
font-weight: 700;
color: inherit;
}
#nav a i.fa {
line-height: 50px;
}
#nav a:hover {
color: #fff;
}
Expand Down Expand Up @@ -289,7 +286,15 @@ h3:hover a.link-anchor {
}

a.link-anchor {
padding-right: 25px;
padding-right: 10px;
position: absolute;
margin-left: -25px;
margin-left: -30px;
}

/*
* For some reason, Font Awesome 5 icons do not keep their expected weight,
* which messes up with, for example, the GitHub icon.
*/
.fab, .fas {
font-weight: normal;
}
Binary file added css/webfonts/fa-brands-400.eot
Binary file not shown.
1,175 changes: 1,175 additions & 0 deletions css/webfonts/fa-brands-400.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/webfonts/fa-brands-400.ttf
Binary file not shown.
Binary file added css/webfonts/fa-brands-400.woff
Binary file not shown.
Binary file added css/webfonts/fa-brands-400.woff2
Binary file not shown.
Binary file added css/webfonts/fa-solid-900.eot
Binary file not shown.
2,564 changes: 2,564 additions & 0 deletions css/webfonts/fa-solid-900.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/webfonts/fa-solid-900.ttf
Binary file not shown.
Binary file added css/webfonts/fa-solid-900.woff
Binary file not shown.
Binary file added css/webfonts/fa-solid-900.woff2
Binary file not shown.
Binary file removed fonts/FontAwesome.otf
Binary file not shown.
Binary file removed fonts/fontawesome-webfont.eot
Binary file not shown.
2,671 changes: 0 additions & 2,671 deletions fonts/fontawesome-webfont.svg

This file was deleted.

Binary file removed fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file removed fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file removed fonts/fontawesome-webfont.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
$("#main h2, #main h3").each(function() {
$(this).prepend($(
`<a class="link-anchor" href="#${$(this).attr("id")}">` +
'<i class="fa fa-link" aria-hidden="true"></i>' +
'<i class="fas fa-link" aria-hidden="true"></i>' +
'</a>'
));
});
Expand Down