From 858e2df9de416eb13c3fa0c80c163a48ce7af9e5 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Tue, 28 Nov 2017 14:50:36 -0800 Subject: [PATCH] Simplify DOM and add lockfile --- .gitignore | 1 - _layouts/default.html | 19 ++++++++----------- css/style.scss | 8 ++++---- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 666de10..45c1505 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ _site .sass-cache .jekyll-metadata -Gemfile.lock diff --git a/_layouts/default.html b/_layouts/default.html index fdf6465..f0c291f 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,19 +3,16 @@ {% include head.html %} -
- {% include header.html %} + {% include header.html %} -
- {% include sidebar.html %} +
+ {% include sidebar.html %} -
- {{ content }} -
-
- - -
+
+ {{ content }} +
+ + \ No newline at end of file diff --git a/css/style.scss b/css/style.scss index 8018ed1..2ec13e5 100644 --- a/css/style.scss +++ b/css/style.scss @@ -58,12 +58,12 @@ } -body { +html{ margin: 0; background-color: $margin; } -#box { +body { background-color: $background; max-width: 800px; z-index: 0; @@ -115,7 +115,7 @@ header { } } -#main { +main { display: flex; } @@ -173,7 +173,7 @@ header { } } - #main { + main { flex-direction: column; } }