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.

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

Css tweaks #51

Merged
merged 7 commits into from
Jan 15, 2019
Merged

Css tweaks #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7711d96
fix(footer): fix footer being too high
Jan 15, 2019
bf59ea6
fix(index): more spacing to breath a bit
Jan 15, 2019
1682b44
fix(ignore): ignore vscode files
Jan 15, 2019
a5c6ba8
fix(overall): align nav bar, smaller logo on other pages
Jan 15, 2019
4f23887
fix(css): left menu is not overflowed by content anymore
Jan 15, 2019
bffd394
revert vscode ignore
Jan 15, 2019
f0d0c10
refactor(navbar): factorise navbar into a layout file
Jan 15, 2019
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
11 changes: 2 additions & 9 deletions _includes/header.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
<div class="inner">
<div class="primary">
<h1><a href="/">
<img src="/public/images/logo.svg" width="98" />
<span>Cobalt</span>
<img src="/public/images/logo.svg" width="50" />obalt
</a></h1>
</div>
<div class="secondary">
<nav>
<a href="/getting-started" class="button start"><span>Start</span></a>
<a href="/docs" class="button docs"><span>Reference</span></a>
<a href="/news" class="button news"><span>News</span></a>
<a href="https://github.com/cobalt-org/cobalt.rs/blob/master/CONTRIBUTING.md" class="button contrib"><span>Contribute</span></a>
<a href="/help" class="button help"><span>Help!</span></a>
</nav>
{% include "navbar.liquid" %}
</div>
</div>
11 changes: 11 additions & 0 deletions _includes/header_landing.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<div class="inner">
<div class="primary">
<h1><a href="/">
<img src="/public/images/logo.svg" width="98" />
<span>Cobalt</span>
</a></h1>
</div>
<div class="secondary">
{% include "navbar.liquid" %}
</div>
</div>
7 changes: 7 additions & 0 deletions _includes/navbar.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<nav>
<a href="/getting-started" class="button start"><span>Start</span></a>
<a href="/docs" class="button docs"><span>Reference</span></a>
<a href="/news" class="button news"><span>News</span></a>
<a href="https://github.com/cobalt-org/cobalt.rs/blob/master/CONTRIBUTING.md" class="button contrib"><span>Contribute</span></a>
<a href="/help" class="button help"><span>Help!</span></a>
</nav>
17 changes: 17 additions & 0 deletions _layouts/landing.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html>
<head>
{% include "head.liquid" %}
</head>
<body>
<header>
{% include "header_landing.liquid" %}
</header>
<main>
{{ page.content }}
</main>
<footer>
{% include "footer.liquid" %}
</footer>
</body>
</html>
9 changes: 5 additions & 4 deletions index.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
---
permalink: /
title: A static site generator
layout: landing.liquid
---
<section class="introduction">
<div class="inner">
<p>A static-site generator that works for you.</p>
<p class="top_margin">A static-site generator that works for you.</p>
<div class="columns three">
<article>
<h3>Simple</h3>
<p>Cobalt will help you get up and running quickly but scales to handle
your more complex cases</p>
your more complex cases</p>
</article>
<article>
<h3>Easy</h3>
<p>Cobalt tries to be no-hassle, from being easy to install, a
workflow-centric command line, to a familiar template language.</p>
workflow-centric command line, to a familiar template language.</p>
</article>
<article>
<h3>Fast</h3>
<p>Quickly see the results of your work.</p>
</article>
</div>
</div>
</section>
</section>
37 changes: 27 additions & 10 deletions public/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@

--font-stack: helvetica, arial, sans-serif;

--breakpoint: 45em;
--breakpoint: 55em;
}

html {
box-sizing: border-box;
height: 100%;
}

*, *:before, *:after {
Expand All @@ -49,6 +50,13 @@ body {
font-family: var(--font-stack);
line-height: 1.4;
margin: 0;
display: flex;
flex-direction: column;
height: 100%;
}

main {
flex: 1;
}

a {
Expand All @@ -67,6 +75,7 @@ header {

header .primary h1 {
text-align: center;
margin-bottom: 0;
}

header .primary h1 a {
Expand All @@ -91,7 +100,7 @@ header nav {
justify-content: center;
}

@media (max-width: 41em) {
@media (max-width: 51em) {
header nav {
max-width: 100%;
overflow: hidden;
Expand All @@ -114,7 +123,7 @@ header nav .button > span {
display: inline-block;
}

@media (min-width: 41em) {
@media (min-width: 51em) {
header .inner {
display: flex;
justify-content: center;
Expand All @@ -137,6 +146,7 @@ header nav .button > span {
flex: 1 0 50%;
flex-direction: column;
justify-content: flex-end;
margin-bottom: 0.8rem;
}

header h1 {
Expand All @@ -148,7 +158,7 @@ header nav .button > span {
padding: 0 1em 0 1em;
}

@media (min-width: 41em) {
@media (min-width: 51em) {
.inner {
margin: 0 auto;
max-width: var(--breakpoint);
Expand Down Expand Up @@ -205,7 +215,7 @@ section.docs aside ul li a:focus {
}

section.docs aside {
flex: 0 1 30%;
flex: 0 0 30%;
}

section.docs main {
Expand All @@ -218,8 +228,6 @@ section.docs ul {
padding: 0;
}



pre {
display: block;
padding: 9.5px;
Expand All @@ -232,7 +240,7 @@ pre {
background-color: #f5f5f5;
border: 1px solid #ccc;
text-shadow: none;
overflow-x: auto;
overflow-x: scroll;
}

code {
Expand All @@ -255,6 +263,10 @@ pre code {
border: 0;
}

.top_margin {
padding-top: 3em;
}

.button {
background: var(--med-grey);
border-radius: 3px;
Expand Down Expand Up @@ -320,14 +332,14 @@ pre code {
background: var(--med-grey);
}

@media (min-width: 45em) {
@media (min-width: 51em) {
.columns {
display: flex;
}

.columns.three > article {
flex: 0 1 33%;
margin-right: 1%;
margin-right: 3%;
}

.columns.three > article:last-child {
Expand Down Expand Up @@ -368,3 +380,8 @@ table tbody td {
border: 1px solid #ccc;
padding: 0.5em;
}

.flex_h {
display: flex;
flex-direction: row;
}