Skip to content

Commit

Permalink
reskin and jekyll upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
@philhawksworth
philhawksworth committed May 17, 2014
1 parent bc06346 commit 75b1a86
Show file tree
Hide file tree
Showing 70 changed files with 1,162 additions and 963 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
View file
@@ -0,0 +1,9 @@
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
2 changes: 0 additions & 2 deletions .gitignore
View file
@@ -1,6 +1,4 @@
node_modules
*.pyc
_site
_simpleform_cache
.sass-cache
.vagrant
1 change: 0 additions & 1 deletion .vagrant/machines/default/virtualbox/id
View file

This file was deleted.

7 changes: 3 additions & 4 deletions _config.yml
View file
Expand Up @@ -2,11 +2,10 @@ port: 8000
source: ./src
destination: ./_site
plugins: ./_plugins
pygments: true
highlighter: true
tag_dir: /blog/tag
permalink: /blog/:title

sass:
syntax: scss # scss|sass
style: compressed # nested|expanded|compact|compressed
compile_in_place: false
sass_dir: css/_scss
style: compressed
24 changes: 0 additions & 24 deletions _plugins/add-sass.rb
View file

This file was deleted.

4 changes: 2 additions & 2 deletions _plugins/tags.rb
View file
Expand Up @@ -8,8 +8,8 @@ def initialize(site, base, dir, tag)
self.process(@name)
self.read_yaml(File.join(base, '_layouts'), 'tag_index.html')
self.data['tag'] = tag
tag_title_prefix = site.config['tag_title_prefix'] || 'Posts Tagged “'
tag_title_suffix = site.config['tag_title_suffix'] || '”'
tag_title_prefix = site.config['tag_title_prefix'] || '#'
tag_title_suffix = site.config['tag_title_suffix'] || ''
self.data['title'] = "#{tag_title_prefix}#{tag}#{tag_title_suffix}"
end
end
Expand Down
3 changes: 2 additions & 1 deletion src/_includes/post_header.html
View file
@@ -1,4 +1,4 @@
<h1 class="post-title">{{ page.title }}</h1>
<!-- <h1 class="post-title">{{ page.title }}</h1>
<aside>
<address class="vcard">
Posted by <a class="url n fn" rel="author" href="/">Phil Hawksworth</a>
Expand Down Expand Up @@ -26,3 +26,4 @@ <h1 class="post-title">{{ page.title }}</h1>
<p class="excerpt">
{{ page.excerpt }}
</p>
-->
172 changes: 103 additions & 69 deletions src/_layouts/base.html
View file
@@ -1,79 +1,113 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="robots" content="index, follow"/>
<meta name="viewport" content="width=device-width">
<link rel="stylesheet" href="/css/styles.css">
<meta name="description" content="{{ page.description }}">
<title>{{ page.title }}</title>
<head>
<meta charset="utf-8">
<meta name="robots" content="index, follow"/>
<meta name="viewport" content="width=device-width, minimum-scale=1.0">
<link rel="stylesheet" href="/css/styles.css">
<meta name="description" content="{{ page.description }}">
<title>{{ page.title }}</title>
<!--
The javascript and assets for this site are compressed for performance reasons.
However, it's always nice to be able to see what is going on under the hood for
the sake of learning and tinkering.
<!--
The javascript and assets for this site are compressed for performance reasons.
However, it's always nice to be able to see what is going on under the hood for
the sake of learning and tinkering.
You can see the uncompressed versions of the Javascript, and indeed the entire
source of this site at https://github.com/philhawksworth/hawksworx.com
You can see the uncompressed versions of the Javascript, and indeed the entire
source of this site at https://github.com/philhawksworth/hawksworx.com
Thanks for popping by!
-->

</head>
<body class="{{ page.pageclass }}">
<header>
<div class="wrapper">
<h1>
<a href="/" title="hawksworx: home">hawksworx</a>
</h1>
<p>
noodlings about the web and whatnot
</p>
{% include navigation.html %}
</div>
</header>

<div class="search">
<div class="wrapper">
<form action="https://www.google.co.uk/search" metho="get">
<label for="searchstr">search the blog</label><input type="text" class="searchstr" id="searchstr" />
</form>
<ul class="results"></ul>
</div>
</div>


<div class="wrapper">
{{ content }}
</div>

{% comment %}
We conditionally include the blog comments code here by looking to
see if the page has tags (only blog posts do). We have to do it this
way as liquid template layouts can't consume blocks created in pages.


{% if page.tags != nill %}
{% if site.url == 'hawksworx.com' %}
{% include comments.html %}
{% endif %}
{% endif %}
Thanks for popping by!
-->
</head>
<body class="{{ page.pageclass }}">
<div class="header">
<div class="container">
<ul class="nav">
<li><a href="/" class="home">hawksworx</a></li>
<li><a href="/blog">blog</a></li>
<li><a href="/speaking">speaking</a></li>
<li class="search">
<a href="/search">search</a>
<form action="" method="get" class="searchform" id="searchform">
<input type="hidden" name="q" id="site" value="site:hawksworx.com">
<input type="text" name="q" class="q" placehoder="search" id="searchstr">
</form>
</li>
</ul>
<div class="search-results">
<ul class="listing"></ul>
</div>
<h1 {% if page.tags %}{% else %}class="shout"{% endif %}>{{ page.title }}</h1>
{% if page.tags %}
<div class="meta">
Posted by Phil Hawksworth on <time>{{ page.date | date_to_long_string }}</time>
<br>and tagged
{% for tag in page.tags %}
{% if forloop.last %}
and
{% endif %}
<a href="/blog/tag/{{ tag }}">#{{ tag }}</a>
{% endfor %}
</div>
{% endif %}
</div>
</div>

{% endcomment %}
<div class="content">
<div class="container">
{{ content }}
</div>
</div>

{% if page.footnote %}
<div class="credits">
<div class="container">
{{ page.footnote }}
</div>
</div>
{% endif %}

<footer>
<div class="wrapper">
<h1><a href="/" title="hawksworx: home">hawksworx</a></h1>
<p>noodlings about the web and whatnot</p>
{% include navigation.html %}
</div>
<p class="colo">
Follow <a href="http://twitter.com/philhawksworth" rel="me">@philhawksworth</a> on twitter for more regular wibblings. This site is powered by <a href="https://github.com/mojombo/jekyll">Jekyll</a>, hosted on <a href="http://pages.github.com">GitHub Pages</a> and the source can be found on <a href="https://github.com/philhawksworth/hawksworx.com">Github</a>
<div class="footer">
<div class="container">
<div class="howdy">
<h2>Howdy</h2>
<img src="/images/philhawksworth.jpg" alt="Phil Hawksworth" class="face">
<p>
I'm Phil Hawksworth, a web developer working in London at <a href="http://rga.com">R/GA</a>
</p>
<p>
Elsewhere
<a rel="me" href="http://twitter.com/philhawksworth">Twitter</a>
<a rel="me" href="http://flickr.com/philhawksworth">Flickr</a>
<a rel="me" href="http://instagram.com/philhawksworth">Instagram</a>
<a rel="me" href="http://github.com/philhawksworth">Github</a>
</p>
<p>
Nerds and colleagues might need my <a href="/philhawksworth.pub.txt">Public ssh key</a>
</p>
</div>
<div class="colo">
<h2>About this site</h2>
<p>
This site is served statically from Github pages after being built with Jekyll. The source is available on Github.
</p>
<p>
<em>Other than where specified, the content on this site is published under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons</a> Attribution 3.0 licence.</em>
</p>
</footer>
</div>
</div>
<div class="nav">
<div class="container">
<ul class="nav">
<li><a href="/" class="home">hawksworx</a></li>
<li><a href="/blog">blog</a></li>
<li><a href="/speaking">speaking</a></li>
<li><a href="/search">search</a></li>
</ul>
</div>
</div>
</div>

<script src="/js/hawksworx.js" type="text/javascript"></script>
{% include analytics.html %}
</body>
<script src="/js/hawksworx.js" type="text/javascript"></script>
{% include analytics.html %}
</body>
</html>
8 changes: 4 additions & 4 deletions src/_layouts/post.html
View file
Expand Up @@ -2,7 +2,7 @@
layout: base
pageclass: blog
---
<article class="post">
{{ content }}
</div> <!-- // post-content -->
</article>

{{ page.content }}


39 changes: 22 additions & 17 deletions src/_layouts/tag_index.html
View file
Expand Up @@ -4,26 +4,31 @@
---


<article>
<aside>
<p>Blog posts tagged {{ page.tag }}</p>
</aside>


<div class="post-content">
{% for post in site.posts %}{% for tag in post.tags %}{% if tag == page.tag %}
{% include post_teaser.html %}
{% endif %}{% endfor %}{% endfor %}
{% for post in site.posts %}{% for tag in post.tags %}{% if tag == page.tag %}


<h2>Other tags:</h2>
<ul>
{% for tag in site.tags | sort %}
{% assign t = tag.first %}
{% assign posts = tag.last %}
<li><a href="/blog/tag/{{ t }}">{{ t }}</a> ({{ posts | size }})</li>
{% endfor %}
</ul>
<article class="post listing">
<h2 class="post-title"><a href="{{ post.url }}">{{ post.title }}</a></h2>
<div class="meta">
<time datetime="{{post.date}}">{{post.date | date_to_long_string}}</time>
Tagged
{% for tag in post.tags %}
{% if forloop.last %}
and
{% endif %}
<a href="/blog/tag/{{ tag }}">{{ tag }}</a>
{% endfor %}
</div>
</article>
{% endif %}{% endfor %}{% endfor %}


<p>Other tags used on the blog:</p>
<ul>
{% for tag in site.tags | sort %}
{% assign t = tag.first %}
{% assign posts = tag.last %}
<li><a href="/blog/tag/{{ t }}">{{ t }}</a> ({{ posts | size }})</li>
{% endfor %}
</ul>
11 changes: 7 additions & 4 deletions src/_posts/2007-11-04-opening-a-finder-window-from-the-terminal.html
View file
@@ -1,14 +1,17 @@
---
layout: post
tags: ["osx", "tips"]
image:
title: Opening a Finder window from the Terminal
description: A tip for more easily moving between the terminal and the Finder in OSX
excerpt: |
I stumbled upon a simple method for opening a Finder window at your current Terminal session location recently. Since it is something that I have a regular need for, I thought that there might be other Mac users out there who might also find this useful from time to time.
---

{% include post_header.html %}
<div class="grab">
<p>
I stumbled upon a simple method for opening a Finder window at your current Terminal session location recently. Since it is something that I have a regular need for, I thought that there might be other Mac users out there who might also find this useful from time to time.
</p>
</div>

<!-- more -->

<p>To set things up so that it is easy to use whenever you need it, you just need to follow these two steps:</p>
<p>First, using your <a href="http://www.macromates.com">preferred text editor</a> create a file which contains this command:</p>
Expand Down
12 changes: 8 additions & 4 deletions src/_posts/2007-12-17-osmosoft-return-from-leweb3-intact.html
View file
@@ -1,14 +1,18 @@
---
layout: post
tags: ["news", "events", "tools", "osmosoft"]
image: le-web-3.jpg
title: Osmosoft return from LeWeb3 intact
description: Looking back at the experience of attending and exhibiting at LeWeb3 in Paris
excerpt: |
Last week the entire <a href="http://www.osmosoft.com">Osmosoft</a> team visited Paris to attend the <a href="http://www.leweb3.com">LeWeb3</a> conference. Initially, we had intended to be attending simply as delegates, but as time went by, we decided that we might be able to build something handy to use at the conference, and that perhaps, others might find it useful too.
---

{% include post_header.html %}
<div class="grab">
<p>
Last week the entire <a href="http://www.osmosoft.com">Osmosoft</a> team visited Paris to attend the <a href="http://www.leweb3.com">LeWeb3</a> conference. Initially, we had intended to be attending simply as delegates, but as time went by, we decided that we might be able to build something handy to use at the conference, and that perhaps, others might find it useful too.
</p>
</div>
<figure><img src="/images/le-web-3.jpg" alt=""></figure>

<!-- more -->


<p>And so, <a href="http://ripplerap.com">RippeRap</a> (then dubbed 'TiddleLeWeb') was conceived. We considered that building a tool based on <a href="http://www.tiddlywiki.com">TiddlyWiki</a> where you could make notes on the conference and effortlessly share those notes with others, while being shielded from network hiccups, would be cool. To be ready, we had much to do, and little time to do it.</p>
Expand Down

0 comments on commit 75b1a86

Please sign in to comment.