From 4ac767f1f6108aca865f60a3e93d707c0132cba7 Mon Sep 17 00:00:00 2001 From: Micah Cowell Date: Sun, 13 Mar 2016 21:35:46 -0700 Subject: [PATCH] new pages and redesign --- _config.yml | 2 +- _data/navigation.yml | 6 ++++ _includes/{header.html => nav.html} | 3 +- _layouts/default.html | 2 +- _sass/_about.scss | 0 _sass/_header.scss | 14 --------- _sass/_post.scss | 4 --- assets/css/main.scss | 44 +++++++++++++++++++++++------ index.html | 13 +-------- me/index.html | 8 ++++++ work/index.html | 15 ++++++++++ 11 files changed, 69 insertions(+), 42 deletions(-) rename _includes/{header.html => nav.html} (80%) delete mode 100644 _sass/_about.scss delete mode 100644 _sass/_header.scss delete mode 100644 _sass/_post.scss create mode 100644 work/index.html diff --git a/_config.yml b/_config.yml index 112d649..7ccdf47 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,6 @@ # My variables name: Micah Cowell -description: a clueless web developer +description: developer & designer google_analytics: null google_verification: null diff --git a/_data/navigation.yml b/_data/navigation.yml index e75032f..933b551 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,6 +1,12 @@ +- title: home + url: / + - title: about url: /me +- title: portfolio + url: /work + - title: github url: https://github.com/getmicah diff --git a/_includes/header.html b/_includes/nav.html similarity index 80% rename from _includes/header.html rename to _includes/nav.html index eb6821f..19b0428 100644 --- a/_includes/header.html +++ b/_includes/nav.html @@ -1,9 +1,8 @@ -
+

{{ site.name }}

{{ site.description }}

    -
  • home
    • {% for item in site.data.navigation %}
  • {{ item.title }} diff --git a/_layouts/default.html b/_layouts/default.html index 3acb120..8ce00d6 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -26,7 +26,7 @@
    - {% include header.html %} + {% include nav.html %} {{ content }}
    diff --git a/_sass/_about.scss b/_sass/_about.scss deleted file mode 100644 index e69de29..0000000 diff --git a/_sass/_header.scss b/_sass/_header.scss deleted file mode 100644 index d3227c0..0000000 --- a/_sass/_header.scss +++ /dev/null @@ -1,14 +0,0 @@ -// HEADER -.header { - h1 { - font-size: 36px; - } - h2 { - font-size: 20px; - } - ul { - li { - display: inline; - } - } -} diff --git a/_sass/_post.scss b/_sass/_post.scss deleted file mode 100644 index 1ea7e1a..0000000 --- a/_sass/_post.scss +++ /dev/null @@ -1,4 +0,0 @@ -// POST -.post { - margin-top: 20px; -} diff --git a/assets/css/main.scss b/assets/css/main.scss index e71d3f5..108b9f2 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -3,9 +3,6 @@ @import "reset"; @import "config"; -@import "header"; -@import "post"; -@import "about"; body { @@ -31,6 +28,12 @@ a { text-decoration: none; } } +ul { + margin-top: 5px; + li { + margin-top: 5px; + } +} // WRAPPER @@ -41,19 +44,44 @@ a { } -// PORTFOLIO -.portfolio { - margin-top: 20px; +// NAVIGATION +.nav { h1 { - font-size: 24px; + font-size: 36px; + } + h2 { + font-size: 20px; + } + ul { + li { + display: inline; + margin-right: 5px; + } } } -// BLOG .blog { margin-top: 20px; h1 { font-size: 24px; } } + + +.post { + margin-top: 20px; +} + + +.about { + margin-top: 20px; +} + + +.portfolio { + margin-top: 20px; + h1 { + font-size: 24px; + } +} diff --git a/index.html b/index.html index 1bdf5bb..217bc4f 100644 --- a/index.html +++ b/index.html @@ -2,24 +2,13 @@ layout: default --- -
    -

    Portfolio

    - -
    -

    Blog

    diff --git a/me/index.html b/me/index.html index e69de29..3f26bd4 100644 --- a/me/index.html +++ b/me/index.html @@ -0,0 +1,8 @@ +--- +layout: default +--- + + +
    +

    About Me

    +
    diff --git a/work/index.html b/work/index.html new file mode 100644 index 0000000..363a64d --- /dev/null +++ b/work/index.html @@ -0,0 +1,15 @@ +--- +layout: default +--- + + +
    +

    Portfolio

    + +