new pages and redesign

2016-03-13 21:35:46 -07:00 · 2016-03-13 21:35:46 -07:00 · 4ac767f1f6
parent 913c3b720a
commit 4ac767f1f6
11 changed files with 69 additions and 42 deletions
--- 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

--- 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

--- a/_includes/header.html
+++ b/_includes/header.html
@ -1,9 +1,8 @@

-<div class="header">
+<div class="nav">
    <h1>{{ site.name }}</h1>
    <h2>{{ site.description }}</h2>
    <ul>
-        <li><a href="/">home</a></li>
        {% for item in site.data.navigation %}
        <li>
            <a href="{{ item.url }}">{{ item.title }}</a>
--- a/_layouts/default.html
+++ b/_layouts/default.html
@ -26,7 +26,7 @@
 <body>

    <div class="wrapper">
-        {% include header.html %}
+        {% include nav.html %}
        {{ content }}
    </div>

--- a/_sass/_about.scss
+++ b/_sass/_about.scss
--- a/_sass/_header.scss
+++ b/_sass/_header.scss
@ -1,14 +0,0 @@
-// HEADER
-.header {
-    h1 {
-        font-size: 36px;
-    }
-    h2 {
-        font-size: 20px;
-    }
-    ul {
-        li {
-            display: inline;
-        }
-    }
-}
--- a/_sass/_post.scss
+++ b/_sass/_post.scss
@ -1,4 +0,0 @@
-// POST
-.post {
-    margin-top: 20px;
-}
--- 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;
+    }
+}
--- a/index.html
+++ b/index.html
@ -2,24 +2,13 @@
 layout: default
 ---

-<div class="portfolio">
-    <h1>Portfolio</h1>
-    <ul>
-        {% for project in site.data.projects %}
-        <li>
-            <a href="{{ project.url }}">{{ project.title }}</a>
-        </li>
-        {% endfor %}
-    </ul>
-</div>
-

 <div class="blog">
    <h1>Blog</h1>
    <ul>
        {% for post in site.posts %}
        <li>
-            <a href="{{ post.url }}">{{ post.title }} | {{ post.date | date: '%b %d %Y' }}</a>
+            <span class="date">{{ post.date | date: '%b %d %Y' }}</span> | <a href="{{ post.url }}">{{ post.title }}</a>
        </li>
        {% endfor %}
    </ul>
--- a/me/index.html
+++ b/me/index.html
@ -0,0 +1,8 @@
+---
+layout: default
+---
+
+
+<div class="about">
+    <h1>About Me</h1>
+</div>
--- a/work/index.html
+++ b/work/index.html
@ -0,0 +1,15 @@
+---
+layout: default
+---
+
+
+<div class="portfolio">
+    <h1>Portfolio</h1>
+    <ul>
+        {% for project in site.data.projects %}
+        <li>
+            <a href="{{ project.url }}">{{ project.title }}</a>
+        </li>
+        {% endfor %}
+    </ul>
+</div>