diff --git a/Gruntfile.js b/Gruntfile.js index 0626942..7aa676b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -63,10 +63,21 @@ module.exports = function(grunt) { files: [{ expand: true, cwd: '<%= config.source %>/assets/', - src: ['{fonts,img,icon,data,vendor}/**/*'], + src: ['{js,fonts,img,icon,data,vendor}/**/*'], dest: '<%= config.dest %>/assets/' }] }, + vendor: { + files: [{ + expand: true, + flatten: true, + cwd: './node_modules/', + src: [ + 'normalize.css/normalize.css' + ], + dest: '<%= config.dest %>/assets/vendor/' + }] + }, misc: { files: [{ expand: true, diff --git a/package.json b/package.json index c6e75ba..5195ae3 100644 --- a/package.json +++ b/package.json @@ -29,5 +29,8 @@ "grunt-sass": "^2.0.0", "grunt-sass-lint": "^0.2.2", "load-grunt-tasks": "^3.5.2" + }, + "dependencies": { + "normalize.css": "^7.0.0" } } diff --git a/site/partials/footer.hbs b/site/assets/scss/elements/_icons.scss similarity index 100% rename from site/partials/footer.hbs rename to site/assets/scss/elements/_icons.scss diff --git a/site/assets/scss/elements/_typography.scss b/site/assets/scss/elements/_typography.scss new file mode 100644 index 0000000..98f9245 --- /dev/null +++ b/site/assets/scss/elements/_typography.scss @@ -0,0 +1,41 @@ +.h1, +h1 { +} + +.h2, +h2 { +} + +.h3, +h3 { +} + +.h4, +h4 { +} + +.h5, +h5 { +} + +.h6, +h6 { +} + +a { + &:visited { + } + + &:hover { + } + + &:active { + } +} + +.small { +} + +code { + +} diff --git a/site/assets/scss/generic/_reset.scss b/site/assets/scss/generic/_reset.scss new file mode 100644 index 0000000..f25ffa2 --- /dev/null +++ b/site/assets/scss/generic/_reset.scss @@ -0,0 +1,28 @@ +// normalize css is loaded, then these additions: + +html { + margin: 0; + padding: 0; + font-size: 16px; + box-sizing: border-box; +} + +main, +section, +article, +aside, +footer, +h1, +h2, +h3, +h4, +h5, +h6, +div, +p, +ul, +*::before, +*::after { + box-sizing: inherit; +} + diff --git a/site/assets/scss/main.scss b/site/assets/scss/main.scss new file mode 100644 index 0000000..5452f97 --- /dev/null +++ b/site/assets/scss/main.scss @@ -0,0 +1,12 @@ +@import 'tools/fonts'; +@import 'tools/mixins'; + +@import 'settings/variables'; +@import 'settings/colors'; + +@import 'generic/reset'; + +@import 'elements/typography'; +@import 'elements/icons'; + +// @import 'components/thing'; diff --git a/site/assets/scss/settings/_colors.scss b/site/assets/scss/settings/_colors.scss new file mode 100644 index 0000000..e69de29 diff --git a/site/assets/scss/settings/_variables.scss b/site/assets/scss/settings/_variables.scss new file mode 100644 index 0000000..e69de29 diff --git a/site/assets/scss/tools/_fonts.scss b/site/assets/scss/tools/_fonts.scss new file mode 100644 index 0000000..e69de29 diff --git a/site/assets/scss/tools/_mixins.scss b/site/assets/scss/tools/_mixins.scss new file mode 100644 index 0000000..e69de29 diff --git a/site/layouts/default.hbs b/site/layouts/default.hbs index c4bf256..fa696c5 100644 --- a/site/layouts/default.hbs +++ b/site/layouts/default.hbs @@ -4,14 +4,18 @@ {{> head }} - {{> header }} + {{> analytics }} + + {{> nav-main }} + {{> nav-social }}
{{> body }} - {{> aside }}
- {{> footer }} + {{> javascripts }} diff --git a/site/pages/about.hbs b/site/pages/about.hbs new file mode 100644 index 0000000..bc13ec7 --- /dev/null +++ b/site/pages/about.hbs @@ -0,0 +1,23 @@ +

Mark Moser - digital handyman

+ +

+ I’m a ruby developer exploring and learning everything I can about being a better + developer. This place is where I share my findings, explorations, and other creative + outlets. +

+ +

+ I’m also fond of working in video post production: editing, compositing, and + motion graphics. I can either be your “one man band” for those smaller + productions, put together a killer team when you need even greater production value, + or be the go-to post production guy you call to join your existing team. + I have experience shooting interviews and putting together short informational + videos. I am very comfortable in the whole Adobe Production Suite of tools. +

+ +

+ I have a high value for quality craftsmanship. I want to do great work, with people who + also do great work. I love to explore and learn about my world. I enjoy being + challenged. I take pleasure in providing creative solutions to specific needs, always + keeping the bigger picture in mind. I was raised to work hard and play hard. +

diff --git a/site/pages/index.hbs b/site/pages/index.hbs index bc13ec7..4cb25c4 100644 --- a/site/pages/index.hbs +++ b/site/pages/index.hbs @@ -1,23 +1,30 @@ -

Mark Moser - digital handyman

+

Looking at styling for an h1

+

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed odio dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui. Sed posuere consectetur est at lobortis. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

+

Looking at styling for an h2

+

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed odio dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui. Sed posuere consectetur est at lobortis. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

+

Looking at styling for an h3

+

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed odio dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui. Sed posuere consectetur est at lobortis. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

+

Looking at styling for an h4

+

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed odio dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui. Sed posuere consectetur est at lobortis. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

+
Looking at styling for an h5
+

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed odio dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui. Sed posuere consectetur est at lobortis. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

+
Looking at styling for an h6
+

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed odio dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui. Sed posuere consectetur est at lobortis. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

-

- I’m a ruby developer exploring and learning everything I can about being a better - developer. This place is where I share my findings, explorations, and other creative - outlets. -

+ + function thing1(thing2) { + var thing3 = 'some default value'; + return thing2 + thing3; + } + -

- I’m also fond of working in video post production: editing, compositing, and - motion graphics. I can either be your “one man band” for those smaller - productions, put together a killer team when you need even greater production value, - or be the go-to post production guy you call to join your existing team. - I have experience shooting interviews and putting together short informational - videos. I am very comfortable in the whole Adobe Production Suite of tools. -

+ -

- I have a high value for quality craftsmanship. I want to do great work, with people who - also do great work. I love to explore and learn about my world. I enjoy being - challenged. I take pleasure in providing creative solutions to specific needs, always - keeping the bigger picture in mind. I was raised to work hard and play hard. -

+Do a Thing! +Do another thing diff --git a/site/partials/analytics.hbs b/site/partials/analytics.hbs new file mode 100644 index 0000000..7df29fa --- /dev/null +++ b/site/partials/analytics.hbs @@ -0,0 +1,11 @@ + diff --git a/site/partials/head.hbs b/site/partials/head.hbs index ce9eb7f..8241205 100644 --- a/site/partials/head.hbs +++ b/site/partials/head.hbs @@ -1,23 +1,10 @@ - - -Mark Moser | A Little About Me - - - - +Mark Moser{{#if title}} | {{title}}{{/if}} + + diff --git a/site/partials/header.hbs b/site/partials/header.hbs deleted file mode 100644 index 72236e6..0000000 --- a/site/partials/header.hbs +++ /dev/null @@ -1,34 +0,0 @@ - - - diff --git a/site/partials/nav-foot.hbs b/site/partials/nav-foot.hbs new file mode 100644 index 0000000..91572e5 --- /dev/null +++ b/site/partials/nav-foot.hbs @@ -0,0 +1,8 @@ + diff --git a/site/partials/nav-main.hbs b/site/partials/nav-main.hbs new file mode 100644 index 0000000..1146364 --- /dev/null +++ b/site/partials/nav-main.hbs @@ -0,0 +1,15 @@ + diff --git a/site/partials/nav-social.hbs b/site/partials/nav-social.hbs new file mode 100644 index 0000000..449fb6b --- /dev/null +++ b/site/partials/nav-social.hbs @@ -0,0 +1,24 @@ + diff --git a/site/partials/aside.hbs b/site/partials/rail.hbs similarity index 99% rename from site/partials/aside.hbs rename to site/partials/rail.hbs index 57a918c..e7504ba 100644 --- a/site/partials/aside.hbs +++ b/site/partials/rail.hbs @@ -3,6 +3,7 @@ markamoser@gmail.com + + +