This commit is contained in:
Oliver Davies 2015-05-02 21:43:08 +01:00
parent dd0e1fb2f7
commit eed827355e
119 changed files with 1066 additions and 1066 deletions

View file

@ -2,9 +2,9 @@ source 'https://rubygems.org'
group :development do
gem "sass"
gem "sass-globbing"
gem "bootstrap-sass"
gem "compass"
gem "sass"
gem "sass-globbing"
gem "bootstrap-sass"
gem "compass"
end

View file

@ -1,41 +1,41 @@
GEM
remote: https://rubygems.org/
specs:
autoprefixer-rails (5.1.8)
execjs
json
bootstrap-sass (3.3.4.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
chunky_png (1.3.4)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
execjs (2.4.0)
ffi (1.9.8)
json (1.8.2)
multi_json (1.11.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
sass (3.4.13)
sass-globbing (1.1.1)
sass (>= 3.1)
remote: https://rubygems.org/
specs:
autoprefixer-rails (5.1.8)
execjs
json
bootstrap-sass (3.3.4.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
chunky_png (1.3.4)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
execjs (2.4.0)
ffi (1.9.8)
json (1.8.2)
multi_json (1.11.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
sass (3.4.13)
sass-globbing (1.1.1)
sass (>= 3.1)
PLATFORMS
ruby
ruby
DEPENDENCIES
bootstrap-sass
compass
sass
sass-globbing
bootstrap-sass
compass
sass
sass-globbing

View file

@ -1,35 +1,35 @@
<!DOCTYPE html>
<html lang="en-GB" class="no-js">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
{% if page.meta.description %}
<meta name="description" content="{{ page.meta.description|e('html') }}">
{% endif %}
{% if page.meta.og %}{% include "og" with {og: page.meta.og} %}{% endif %}
<link rel="author" href="{{ site.url }}/humans.txt" />
{% include 'title' %}
<link rel="stylesheet" href="{{ site.url }}/{{ theme_path('assets/css/styles.css') }}">
{% block styles %}{% endblock %}
</head>
<body{% if page.body_class %} class="{{ page.body_class }}"{% endif %}>
{% include 'navbar' %}
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
{% if page.meta.description %}
<meta name="description" content="{{ page.meta.description|e('html') }}">
{% endif %}
{% if page.meta.og %}{% include "og" with {og: page.meta.og} %}{% endif %}
<link rel="author" href="{{ site.url }}/humans.txt" />
{% include 'title' %}
<link rel="stylesheet" href="{{ site.url }}/{{ theme_path('assets/css/styles.css') }}">
{% block styles %}{% endblock %}
</head>
<body{% if page.body_class %} class="{{ page.body_class }}"{% endif %}>
{% include 'navbar' %}
<div class="container">
<div class="row">
<div class="col-md-12">
{% block content_wrapper %}
{% block content %}{% endblock %}
{% endblock %}
</div>
</div>{# .row #}
</div>{# .container #}
<div class="container">
<div class="row">
<div class="col-md-12">
{% block content_wrapper %}
{% block content %}{% endblock %}
{% endblock %}
</div>
</div>{# .row #}
</div>{# .container #}
<footer class="container" role="contentinfo">
<p class="copyright">&copy; 2010&ndash;{{ 'now'|date('Y') }} {{ site.title }}. Powered by <a href="http://sculpin.io">Sculpin</a>.</p>
</footer>
<footer class="container" role="contentinfo">
<p class="copyright">&copy; 2010&ndash;{{ 'now'|date('Y') }} {{ site.title }}. Powered by <a href="http://sculpin.io">Sculpin</a>.</p>
</footer>
{% include 'footer-scripts' %}
</body>
{% include 'footer-scripts' %}
</body>
</html>

View file

@ -1,24 +1,24 @@
{% extends 'default' %}
{% block content_wrapper %}
{% include 'post-header' %}
{% block content %}{% endblock %}
{% include 'post-header' %}
{% block content %}{% endblock %}
{% if page.tags %}
<p class="tags">
Tags:
{% for tag in page.tags %}
<a href="{{ site.url }}/blog/tags/{{ tag|url_encode(true) }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
{% endfor %}
</p>
{% endif %}
{% if page.tags %}
<p class="tags">
Tags:
{% for tag in page.tags %}
<a href="{{ site.url }}/blog/tags/{{ tag|url_encode(true) }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
{% endfor %}
</p>
{% endif %}
{% include 'about-author' %}
{% include 'about-author' %}
{% if page.next_post or page.previous_post %}
<ul>
{% if page.next_post %}<li>Next post: <a href="{{ page.next_post.url }}">{{ page.next_post.title }}</a></li>{% endif %}
{% if page.previous_post %}<li>Previous post: <a href="{{ page.previous_post.url }}">{{ page.previous_post.title }}</a></li>{% endif %}
</ul>
{% endif %}
{% if page.next_post or page.previous_post %}
<ul>
{% if page.next_post %}<li>Next post: <a href="{{ page.next_post.url }}">{{ page.next_post.title }}</a></li>{% endif %}
{% if page.previous_post %}<li>Previous post: <a href="{{ page.previous_post.url }}">{{ page.previous_post.title }}</a></li>{% endif %}
</ul>
{% endif %}
{% endblock %}

View file

@ -1,8 +1,8 @@
{% extends 'default' %}
{% block content_wrapper %}
<div class="content">
{% if page.website %}<a href="{{ page.website }}">{{ page.website }}</a>{% endif %}
{% block content %}{% endblock %}
</div>
<div class="content">
{% if page.website %}<a href="{{ page.website }}">{{ page.website }}</a>{% endif %}
{% block content %}{% endblock %}
</div>
{% endblock %}

View file

@ -1,12 +1,12 @@
{% extends 'default' %}
{% block content_wrapper %}
<h1>{{ page.title }}</h1>
{% block content %}{% endblock %}
<h1>{{ page.title }}</h1>
{% block content %}{% endblock %}
{% if page.slides_embed %}
<div class="slides">
{{ page.slides_embed|raw }}
</div>
{% endif %}
{% if page.slides_embed %}
<div class="slides">
{{ page.slides_embed|raw }}
</div>
{% endif %}
{% endblock %}

View file

@ -1,5 +1,5 @@
<div class="about-author">
<h2>About the Author</h2>
<img src="{{ site.gravatar_url }}" alt="Picture of Oliver" class="img-circle">
<p>{{ site.bio|raw }}</p>
<h2>About the Author</h2>
<img src="{{ site.gravatar_url }}" alt="Picture of Oliver" class="img-circle">
<p>{{ site.bio|raw }}</p>
</div>

View file

@ -4,17 +4,17 @@
{% block scripts %}{% endblock %}
{% if page.tweets == true %}
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
{% endif %}
{% if site.google_analytics_tracking_id %}
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '{{ site.google_analytics_tracking_id }}', 'auto');
ga('send', 'pageview');
</script>
ga('create', '{{ site.google_analytics_tracking_id }}', 'auto');
ga('send', 'pageview');
</script>
{% endif %}

View file

@ -1,11 +1,11 @@
{% if data.posts %}
<section class="latest-posts">
<h2>Latest Posts</h2>
<section class="latest-posts">
<h2>Latest Posts</h2>
<ul>
{% for post in data.posts | slice(0,5) %}
<li{% if page.url == post.url %} class="active"{% endif %}><a href="{{ post.url }}">{{ post.title }}</a></li>
{% endfor %}
</ul>
</section>
<ul>
{% for post in data.posts | slice(0,5) %}
<li{% if page.url == post.url %} class="active"{% endif %}><a href="{{ post.url }}">{{ post.title }}</a></li>
{% endfor %}
</ul>
</section>
{% endif %}

View file

@ -1,21 +1,21 @@
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right" role="navigation">
<li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
{% for item in [ 'work', 'services', 'talks', 'blog', 'contact' ] %}
<li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li>
{% endfor %}
</ul>
</div>{# .nav-collapse #}
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right" role="navigation">
<li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
{% for item in [ 'work', 'services', 'talks', 'blog', 'contact' ] %}
<li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li>
{% endfor %}
</ul>
</div>{# .nav-collapse #}
</div>
</nav>

View file

@ -1,37 +1,37 @@
{% if og.title %}
<meta property="og:title" content="{{ og.title|raw }}"/>
<meta property="og:title" content="{{ og.title|raw }}"/>
{% endif %}
{% if og.description %}
<meta property="og:description" content="{{ og.description|raw }}"/>
<meta property="og:description" content="{{ og.description|raw }}"/>
{% endif %}
{% if og.type %}
<meta property="og:type" content="{{ og.type }}"/>
<meta property="og:type" content="{{ og.type }}"/>
{% endif %}
{% if og.image and og.image.url %}
<meta property="og:image" content="{{ og.image.url }}"/>
{% if og.image.type %}
<meta property="og:image:type" content="{{ og.image.type }}"/>
{% endif %}
{% if og.image.width %}
<meta property="og:image:width" content="{{ og.image.width }}"/>
{% endif %}
{% if og.image.height %}
<meta property="og:image:height" content="{{ og.image.height }}"/>
{% endif %}
<meta property="og:image" content="{{ og.image.url }}"/>
{% if og.image.type %}
<meta property="og:image:type" content="{{ og.image.type }}"/>
{% endif %}
{% if og.image.width %}
<meta property="og:image:width" content="{{ og.image.width }}"/>
{% endif %}
{% if og.image.height %}
<meta property="og:image:height" content="{{ og.image.height }}"/>
{% endif %}
{% endif %}
{% if og.title %}
{% if og.image %}
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:image:src" content="{{ og.image.url }}">
<meta name="twitter:creator" content="@opdavies" />
{% else %}
<meta name="twitter:card" content="summary" />
{% endif %}
<meta name="twitter:title" content="{{ og.title|raw }}" />
<meta name="twitter:description" content="{{ og.description|raw }}" />
<meta name="twitter:site" content="@opdavies" />
{% if og.image %}
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:image:src" content="{{ og.image.url }}">
<meta name="twitter:creator" content="@opdavies" />
{% else %}
<meta name="twitter:card" content="summary" />
{% endif %}
<meta name="twitter:title" content="{{ og.title|raw }}" />
<meta name="twitter:description" content="{{ og.description|raw }}" />
<meta name="twitter:site" content="@opdavies" />
{% endif %}

View file

@ -2,9 +2,9 @@
<p class="posted">Posted: {{ page.date | date('jS F Y') }}</p>
{#
{% if page.tags %}
Tags:
{% for tag in page.tags %}
{{ tag }}{% if not loop.last %},{% else %}.{% endif %}
{% endfor %}
Tags:
{% for tag in page.tags %}
{{ tag }}{% if not loop.last %},{% else %}.{% endif %}
{% endfor %}
{% endif %}
#}

View file

@ -1,14 +1,14 @@
{% set separator = '|' %}
{% spaceless %}<title>
{% if page.full_title %}
{{ page.full_title }}
{% elseif page.title and site.title %}
{{ page.title }} {{ separator }} {{ site.title }}
{% elseif site.title %}
{% if site.subtitle %}
{{ site.subtitle }} {{ separator }} {{ site.title }}
{% else %}
{{ site.title }}
{% if page.full_title %}
{{ page.full_title }}
{% elseif page.title and site.title %}
{{ page.title }} {{ separator }} {{ site.title }}
{% elseif site.title %}
{% if site.subtitle %}
{{ site.subtitle }} {{ separator }} {{ site.title }}
{% else %}
{{ site.title }}
{% endif %}
{% endif %}
{% endif %}
</title>{% endspaceless %}

View file

@ -1,3 +1,3 @@
body {
padding-top: 60px;
padding-top: 60px;
}

View file

@ -1,11 +1,11 @@
dt {
margin-top: .5em;
margin-top: .5em;
&:after {
content: ':';
}
&:after {
content: ':';
}
}
dd {
padding-left: 2em;
padding-left: 2em;
}

View file

@ -1,3 +1,3 @@
table {
width: 100%;
width: 100%;
}

View file

@ -1,5 +1,5 @@
.copyright {
border-top: 1px solid #CCC;
margin-top: 1em;
padding-top: 1em;
border-top: 1px solid #CCC;
margin-top: 1em;
padding-top: 1em;
}

View file

@ -1,6 +1,6 @@
.latest-posts {
li.active a {
color: $dark-gray;
font-weight: $semibold;
}
li.active a {
color: $dark-gray;
font-weight: $semibold;
}
}