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

Improve markup, reduce height of navbar, use GitHub logo, add a link to themes #95

Merged
merged 3 commits into from
Oct 26, 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
24 changes: 12 additions & 12 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<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/style.css">

<link rel="shortcut icon" href="/img/favicon.png">
Expand All @@ -20,18 +21,17 @@

<nav id="nav">
<div class="container">
<div class="row">
<div class="col-xs-3">
<a href="/" class="logo">The Lounge</a>
</div>
<div class="col-xs-9 right">
<a href="/docs">Documentation</a>
<a href="https://github.com/thelounge/lounge" class="github">
GitHub
</a>
<!--<a href="/blog">Blog</a>-->
</div>
</div>
<a href="/" class="logo">
<img alt="The Lounge" src="/assets/logos/logo/TL_White&Yellow_Horizontal_logotype_Transparent_Bg/TL_White&Yellow_Horizontal_logotype_Transparent_Bg.svg">
</a>

<ul class="nav-links">
<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>
</a></li>
</ul>
</div>
</nav>
<div id="content">
Expand Down
4 changes: 4 additions & 0 deletions css/font-awesome.min.css

Large diffs are not rendered by default.

46 changes: 25 additions & 21 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,34 +62,41 @@ pre code {
#nav {
background: #455164;
color: #bcc4d3;
padding: 10px 0;
}
#nav ul.nav-links {
float: right;
margin: 0;
padding: 0;
}
#nav ul.nav-links li {
float: left;
list-style: none;
margin: 0;
}
#nav a {
display: inline-block;
height: 50px;
line-height: 50px;
padding: 0 10px;
font-weight: 700;
color: inherit;
}
#nav a i.fa {
line-height: 50px;
}
#nav a:hover {
border-color: #fff;
color: #fff;
}
#nav a + a {
margin-left: 26px;
}
#nav .row {
padding: 20px 0;
}
#nav .logo {
color: #fff;
font-size: 22px;
line-height: 19px;
}
#nav .right {
text-align: right;
line-height: 1;
margin-left: -10px;
}
#nav .github {
border: 2px solid #bcc4d3;
border-radius: 3px;
padding: 6px 12px;

#nav .logo img {
height: 100%;
padding: 5px 0;
}

#splash {
background: #455164;
color: #fff;
Expand Down Expand Up @@ -263,9 +270,6 @@ pre code {
}
}
@media (max-width: 480px) {
#nav .right a:first-child {
display: none;
}
#splash .row {
padding-top: 0;
}
Expand Down
Binary file added fonts/FontAwesome.otf
Binary file not shown.
Binary file added fonts/fontawesome-webfont.eot
Binary file not shown.
2,671 changes: 2,671 additions & 0 deletions fonts/fontawesome-webfont.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 fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file added fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file added fonts/fontawesome-webfont.woff2
Binary file not shown.