From 7711d96c58392640c9711b9b5a79667e29c91841 Mon Sep 17 00:00:00 2001 From: Geobert Quach Date: Tue, 15 Jan 2019 20:02:11 +0000 Subject: [PATCH 1/7] fix(footer): fix footer being too high --- public/css/styles.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/css/styles.css b/public/css/styles.css index 7521e93..4a7f92e 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -36,6 +36,7 @@ html { box-sizing: border-box; + height: 100%; } *, *:before, *:after { @@ -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 { From bf59ea665f36dd3d823961fe40988be99c201731 Mon Sep 17 00:00:00 2001 From: Geobert Quach Date: Tue, 15 Jan 2019 20:19:51 +0000 Subject: [PATCH 2/7] =?UTF-8?q?fix(index):=C2=A0more=20spacing=20to=20brea?= =?UTF-8?q?th=20a=20bit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.liquid | 8 ++++---- public/css/styles.css | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/index.liquid b/index.liquid index e181650..e6d3300 100644 --- a/index.liquid +++ b/index.liquid @@ -4,17 +4,17 @@ title: A static site generator ---
-

A static-site generator that works for you.

+

A static-site generator that works for you.

Simple

Cobalt will help you get up and running quickly but scales to handle - your more complex cases

+ your more complex cases

Easy

Cobalt tries to be no-hassle, from being easy to install, a - workflow-centric command line, to a familiar template language.

+ workflow-centric command line, to a familiar template language.

Fast

@@ -22,4 +22,4 @@ title: A static site generator
-
+ \ No newline at end of file diff --git a/public/css/styles.css b/public/css/styles.css index 4a7f92e..538f7e4 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -31,7 +31,7 @@ --font-stack: helvetica, arial, sans-serif; - --breakpoint: 45em; + --breakpoint: 55em; } html { @@ -263,6 +263,10 @@ pre code { border: 0; } +.top_margin { + padding-top: 3em; +} + .button { background: var(--med-grey); border-radius: 3px; @@ -335,7 +339,7 @@ pre code { .columns.three > article { flex: 0 1 33%; - margin-right: 1%; + margin-right: 3%; } .columns.three > article:last-child { From 1682b44a7e0bfa5f79e6f51f3b3339eb9c2d9c85 Mon Sep 17 00:00:00 2001 From: Geobert Quach Date: Tue, 15 Jan 2019 20:22:08 +0000 Subject: [PATCH 3/7] =?UTF-8?q?fix(ignore):=C2=A0ignore=20vscode=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a2dfc49..5a32c14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store build/ +.vscode/ \ No newline at end of file From a5c6ba872aa890fa05b2449d6660dfd26a42e162 Mon Sep 17 00:00:00 2001 From: Geobert Quach Date: Tue, 15 Jan 2019 20:51:14 +0000 Subject: [PATCH 4/7] fix(overall): align nav bar, smaller logo on other pages --- _includes/header.liquid | 3 +-- _includes/header_landing.liquid | 17 +++++++++++++++++ _layouts/landing.liquid | 17 +++++++++++++++++ index.liquid | 1 + public/css/styles.css | 15 +++++++++++---- 5 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 _includes/header_landing.liquid create mode 100644 _layouts/landing.liquid diff --git a/_includes/header.liquid b/_includes/header.liquid index 4d4def6..168135e 100644 --- a/_includes/header.liquid +++ b/_includes/header.liquid @@ -1,8 +1,7 @@

- - Cobalt + obalt

diff --git a/_includes/header_landing.liquid b/_includes/header_landing.liquid new file mode 100644 index 0000000..4d4def6 --- /dev/null +++ b/_includes/header_landing.liquid @@ -0,0 +1,17 @@ +
+
+

+ + Cobalt +

+
+
+ +
+
diff --git a/_layouts/landing.liquid b/_layouts/landing.liquid new file mode 100644 index 0000000..01df942 --- /dev/null +++ b/_layouts/landing.liquid @@ -0,0 +1,17 @@ + + + + {% include "head.liquid" %} + + +
+ {% include "header_landing.liquid" %} +
+
+ {{ page.content }} +
+
+ {% include "footer.liquid" %} +
+ + diff --git a/index.liquid b/index.liquid index e6d3300..ea17226 100644 --- a/index.liquid +++ b/index.liquid @@ -1,6 +1,7 @@ --- permalink: / title: A static site generator +layout: landing.liquid ---
diff --git a/public/css/styles.css b/public/css/styles.css index 538f7e4..72805b4 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -75,6 +75,7 @@ header { header .primary h1 { text-align: center; + margin-bottom: 0; } header .primary h1 a { @@ -99,7 +100,7 @@ header nav { justify-content: center; } -@media (max-width: 41em) { +@media (max-width: 51em) { header nav { max-width: 100%; overflow: hidden; @@ -122,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; @@ -145,6 +146,7 @@ header nav .button > span { flex: 1 0 50%; flex-direction: column; justify-content: flex-end; + margin-bottom: 0.8rem; } header h1 { @@ -156,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); @@ -332,7 +334,7 @@ pre code { background: var(--med-grey); } -@media (min-width: 45em) { +@media (min-width: 51em) { .columns { display: flex; } @@ -380,3 +382,8 @@ table tbody td { border: 1px solid #ccc; padding: 0.5em; } + +.flex_h { + display: flex; + flex-direction: row; +} \ No newline at end of file From 4f238872cf5786d36ce54c455f5c3226c938c784 Mon Sep 17 00:00:00 2001 From: Geobert Quach Date: Tue, 15 Jan 2019 21:16:59 +0000 Subject: [PATCH 5/7] =?UTF-8?q?fix(css):=C2=A0left=20menu=20is=20not=20ove?= =?UTF-8?q?rflowed=20by=20content=20anymore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/styles.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/public/css/styles.css b/public/css/styles.css index 72805b4..0fa4c99 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -215,7 +215,7 @@ section.docs aside ul li a:focus { } section.docs aside { - flex: 0 1 30%; + flex: 0 0 30%; } section.docs main { @@ -228,8 +228,6 @@ section.docs ul { padding: 0; } - - pre { display: block; padding: 9.5px; @@ -242,7 +240,7 @@ pre { background-color: #f5f5f5; border: 1px solid #ccc; text-shadow: none; - overflow-x: auto; + overflow-x: scroll; } code { From bffd39492658a7347be5c7405b3b5c15239dcf36 Mon Sep 17 00:00:00 2001 From: Geobert Quach Date: Tue, 15 Jan 2019 21:48:22 +0000 Subject: [PATCH 6/7] revert vscode ignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5a32c14..a2dfc49 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ .DS_Store build/ -.vscode/ \ No newline at end of file From f0d0c103961194e96980e70ede46dd35bd0a56a6 Mon Sep 17 00:00:00 2001 From: Geobert Quach Date: Tue, 15 Jan 2019 21:57:59 +0000 Subject: [PATCH 7/7] refactor(navbar): factorise navbar into a layout file --- _includes/header.liquid | 8 +------- _includes/header_landing.liquid | 8 +------- _includes/navbar.liquid | 7 +++++++ 3 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 _includes/navbar.liquid diff --git a/_includes/header.liquid b/_includes/header.liquid index 168135e..7ee83d7 100644 --- a/_includes/header.liquid +++ b/_includes/header.liquid @@ -5,12 +5,6 @@
- + {% include "navbar.liquid" %}
diff --git a/_includes/header_landing.liquid b/_includes/header_landing.liquid index 4d4def6..992f490 100644 --- a/_includes/header_landing.liquid +++ b/_includes/header_landing.liquid @@ -6,12 +6,6 @@
- + {% include "navbar.liquid" %}
diff --git a/_includes/navbar.liquid b/_includes/navbar.liquid new file mode 100644 index 0000000..66bda87 --- /dev/null +++ b/_includes/navbar.liquid @@ -0,0 +1,7 @@ + \ No newline at end of file