diff --git a/_config.yml b/_config.yml index c9841b5..112d649 100644 --- a/_config.yml +++ b/_config.yml @@ -1,13 +1,13 @@ # My variables name: Micah Cowell -description: Futuristic Web Design +description: a clueless web developer google_analytics: null google_verification: null # File management -include: [".htaccess"] -exclude: ["README.md", "LICENSE"] +include: [".htaccess"] +exclude: ["README.md", "LICENSE"] # Sass diff --git a/_data/projects.yml b/_data/projects.yml new file mode 100644 index 0000000..70b3d6d --- /dev/null +++ b/_data/projects.yml @@ -0,0 +1,19 @@ +- title: Gif-Giving + category: website + url: http://gif-giving.com + +- title: Sheri Koetting + category: website + url: http://sherikoetting.com + +- title: GetPeppers + category: website + url: http://getpeppers.com + +- title: Fatso + category: theme + url: https://github.com/getmicah/fatso + +- title: Beam + category: theme + url: https://github.com/getmicah/beam diff --git a/_includes/footer.html b/_includes/footer.html deleted file mode 100644 index e69de29..0000000 diff --git a/_includes/header.html b/_includes/header.html index 7f06531..3ae26eb 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,3 +1,6 @@ +
-

Micah Cowell

+

{{ site.name }}

+

{{ site.description }}

+ home
diff --git a/_layouts/default.html b/_layouts/default.html index 7bbd1c4..3acb120 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -25,9 +25,10 @@ - {% include header.html %} - - {{ content }} +
+ {% include header.html %} + {{ content }} +
diff --git a/_layouts/post.html b/_layouts/post.html index 572863f..eb3c670 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,8 +2,6 @@ layout: default --- -home -

{{ page.title }}

diff --git a/_sass/_reset.scss b/_sass/_reset.scss new file mode 100644 index 0000000..1847353 --- /dev/null +++ b/_sass/_reset.scss @@ -0,0 +1,40 @@ +/* http://meyerweb.com/eric/tools/css/reset/ */ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +ul { + list-style: none; +} +a { + text-decoration: none; +} +// HTML5 display-role reset for older browsers +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +/* END RESET */ diff --git a/assets/css/main.scss b/assets/css/main.scss index 32a98dc..9ce9fe6 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -1,9 +1,49 @@ --- --- +@import "reset"; @import "config"; body { color: $color-primary; background: $color-background; } + + +// WRAPPER +.wrapper { + margin: 30px; +} + + +// HEADER +.header { + h1 { + font-size: 36px; + } + h2 { + font-size: 20px; + } +} + + +// PORTFOLIO +.portfolio { + h1 { + font-size: 24px; + } +} + + +// BLOG +.blog { + h1 { + font-size: 24px; + } +} + + +// POST +.post { + +} diff --git a/css/main.scss b/css/main.scss deleted file mode 100644 index 32a98dc..0000000 --- a/css/main.scss +++ /dev/null @@ -1,9 +0,0 @@ ---- ---- - -@import "config"; - -body { - color: $color-primary; - background: $color-background; -} diff --git a/index.html b/index.html index d7782c3..53c3c86 100644 --- a/index.html +++ b/index.html @@ -2,14 +2,24 @@ layout: default --- -
-