Merge pull request #4 from EdPoole/aNewStart

Redesign

.gitignore

@@ -1,3 +1,5 @@
 .DS_Store
 .sass-cache/
-_site/
+_site/
+node_modules/
+.css

Gemfile.lock

@@ -0,0 +1,115 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RedCloth (4.2.9)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    blankslate (2.1.2.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    classifier (1.3.4)
+      fast-stemmer (>= 1.0.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.8.0)
+    colorator (0.1)
+    execjs (2.2.1)
+    fast-stemmer (1.0.2)
+    ffi (1.9.3)
+    gemoji (2.1.0)
+    github-pages (23)
+      RedCloth (= 4.2.9)
+      jekyll (= 2.2.0)
+      jekyll-coffeescript (= 1.0.0)
+      jekyll-mentions (= 0.1.3)
+      jekyll-redirect-from (= 0.6.0)
+      jekyll-sass-converter (= 1.2.0)
+      jekyll-sitemap (= 0.5.1)
+      jemoji (= 0.3.0)
+      kramdown (= 1.3.1)
+      liquid (= 2.6.1)
+      maruku (= 0.7.0)
+      pygments.rb (= 0.6.0)
+      rdiscount (= 2.1.7)
+      redcarpet (= 3.1.2)
+    html-pipeline (1.9.0)
+      activesupport (>= 2)
+      nokogiri (~> 1.4)
+    i18n (0.6.11)
+    jekyll (2.2.0)
+      classifier (~> 1.3)
+      colorator (~> 0.1)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.0)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-mentions (0.1.3)
+      html-pipeline (~> 1.9.0)
+      jekyll (~> 2.0)
+    jekyll-paginate (1.0.0)
+    jekyll-redirect-from (0.6.0)
+      jekyll (~> 2.0)
+    jekyll-sass-converter (1.2.0)
+      sass (~> 3.2)
+    jekyll-sitemap (0.5.1)
+    jekyll-watch (1.1.0)
+      listen (~> 2.7)
+    jemoji (0.3.0)
+      gemoji (~> 2.0)
+      html-pipeline (~> 1.9)
+      jekyll (~> 2.0)
+    json (1.8.1)
+    kramdown (1.3.1)
+    liquid (2.6.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    maruku (0.7.0)
+    mercenary (0.3.4)
+    mini_portile (0.6.0)
+    minitest (5.4.1)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.9)
+    pygments.rb (0.6.0)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.1.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdiscount (2.1.7)
+    redcarpet (3.1.2)
+    safe_yaml (1.0.3)
+    sass (3.4.2)
+    thread_safe (0.3.4)
+    timers (1.1.0)
+    toml (0.1.1)
+      parslet (~> 1.5.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  github-pages

Gruntfile.coffee

@@ -0,0 +1,40 @@
+module.exports = (grunt) ->
+
+  grunt.initConfig
+    pkg: grunt.file.readJSON 'package.json'
+
+
+    sass:
+      options:
+        outputStyle: 'compressed'
+        sourcemap: true
+      dist:
+        files: 
+          ['assets/css/main.css' : 'assets/css/source/main.scss'];
+
+    autoprefixer:        
+      single_file:
+        options:
+          browsers: ['last 10 version']
+        src: 'assets/css/main.css',
+        dest: 'assets/css/main.css'    
+
+    watch:
+      files: ['assets/css/source/*.scss', 'assets/css/source/**/*.scss']
+      tasks: ['sass', 'autoprefixer']
+      options:
+        nospawn: true
+        interrupt: true
+
+    uglify:
+      compress_mangle:
+        files:
+          'assets/js/main.min.js': ['assets/js/jquery.js', 'assets/js/prism.js', 'assets/js/main.js']
+
+
+  grunt.loadNpmTasks 'grunt-sass'
+  grunt.loadNpmTasks 'grunt-contrib-watch'
+  grunt.loadNpmTasks 'grunt-autoprefixer'
+  grunt.loadNpmTasks 'grunt-contrib-uglify'
+
+  grunt.registerTask 'default', ['sass', 'autoprefixer', 'uglify', 'watch']

_config.yml

@@ -3,7 +3,7 @@ site_name: "Designer and Front-end Developer"
 markdown: rdiscount
 rdiscount:
     extensions: [smart]
-pygments: true
+highlighter: pygments
 permalink: /articles/:title
 paginate_path: 'articles/:num'
 paginate: 5

_drafts/clever-theming-with-scss.md

@@ -0,0 +1,7 @@
+---
+layout: post
+title: Clever Theming with SCSS
+comments: true
+date: 7th September 2014
+extract: Using an assortment of different techniques, it is easy to build a maintainable and scalable solution to theming websites.
+---

_includes/footer.html

@@ -1,23 +1,11 @@
-
-
-<footer>
-	<div class="g">
-		<div class="footer-copyright">
-			<h6>&copy; Ed Poole 2014</h6>
-		</div>
-		<nav>
-			<a href="/resume/">R&eacute;sum&eacute;</a>
-			<a href="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/edpoole">Github</a>
-			<a href="https://dribbble.com/edpoole">Dribbble</a>
-			<a href="https://twitter.com/_ewp">Twitter</a>
-		</nav>
-	</div>
-</footer>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 <script src="/assets/js/main.min.js"></script>
-<script type="text/javascript">var GoSquared = {};GoSquared.acct = "GSN-092357-O";(function(w){function gs(){w._gstc_lt = +new Date;var d = document, g = d.createElement("script");g.type = "text/javascript";g.src = "//d1l6p2sc9645hc.cloudfront.net/tracker.js";var s = d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(g, s);} w.addEventListener ? w.addEventListener("load", gs, false) : w.attachEvent("onload", gs); })(window);
-</script>
+<script>
+  !function(g,s,q,r,d){r=g[r]=g[r]||function(){(r.q=r.q||[]).push(
+  arguments)};d=s.createElement(q);q=s.getElementsByTagName(q)[0];
+  d.src='//d1l6p2sc9645hc.cloudfront.net/tracker.js';q.parentNode.
+  insertBefore(d,q)}(window,document,'script','_gs');
 
-<!-- <script src="//localhost:35729/livereload.js"></script> -->
+  _gs('GSN-092357-O');
+</script>
 </body>
 </html>

_includes/header.html

@@ -1,15 +1,11 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
 	<meta charset="UTF-8">
-	<meta name="google-site-verification" content="6ntKzPTyXIFmjXVtM-gNM9cngqxTH5jxvuWW_FMPgeA" />
-	<title>Ed Poole - UI &amp; UX Designer</title>
-	<link rel="stylesheet" type="text/css" href="//cloud.typography.com/7172872/757322/css/fonts.css" />
-	<link rel="stylesheet" href="/assets/style.css">
-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-	<link rel="shortcut icon" href="/icon.png">
-    <link rel="apple-touch-icon-precomposed" href="/icon.png">
-    <meta name="apple-mobile-web-app-title" content="edpoole.me">
-    <meta name="description" content="User Interface and User Experience Designer">
+	<title>Ed Poole - UI Designer and Front End Developer</title>
+	<meta name="viewport" content="width=device-width, user-scalable=no">
+	<link rel="stylesheet" href="/assets/css/main.css">
+	<script type="text/javascript" src="//use.typekit.net/tia5wcx.js"></script>
+	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 </head>
-<body>
+<body id="main">

_includes/navigation.html

@@ -1,12 +1,10 @@
-<div class="g">
-	<div class="site-nav__logo">
-		<a href="/">Ed <span>Poole</span></a>
-	</div>
- 	<nav class="site-nav__links">
-		<a class="site-nav__link" href="/">Home</a>
-		<a class="site-nav__link" href="/portfolio/">Portfolio</a>
-		<a class="site-nav__link" href="/articles/">Articles</a>
-		<a class="site-nav__link" href="/about/">About</a>
-		<a class="site-nav__link" href="/contact/" id="contact">Contact</a>		
-	</nav>
+<div class="navigation navigation__slug">
+	<a href="#" class="navigation__toggle">
+		<span></span>
+		<span></span>
+		<span></span>
+	</a>
+	<a href="/" class="navigation__link navigation__link--home {% if page.url == '/index.html' %} is-active {% endif %}">Home</a>
+	<a href="/articles" class="navigation__link navigation__link--articles {% if page.url == '/articles/index.html' %} is-active {% endif %}">Articles</a>
+	<a href="/portfolio" class="navigation__link navigation__link--portfolio {% if page.url == '/portfolio/index.html' %} is-active {% endif %}">Portfolio</a>
 </div>