Merge branch 'master' into talks

This commit is contained in:
Oliver Davies 2015-09-16 08:42:05 +01:00
commit bd1c285366
34 changed files with 73 additions and 57 deletions

View file

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

View file

@ -1,12 +1,6 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: 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) chunky_png (1.3.4)
compass (1.0.3) compass (1.0.3)
chunky_png (~> 1.2) chunky_png (~> 1.2)
@ -20,14 +14,12 @@ GEM
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5) compass-import-once (1.0.5)
sass (>= 3.2, < 3.5) sass (>= 3.2, < 3.5)
execjs (2.4.0) ffi (1.9.10)
ffi (1.9.8) multi_json (1.11.2)
json (1.8.2) rb-fsevent (0.9.6)
multi_json (1.11.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
sass (3.4.13) sass (3.4.18)
sass-globbing (1.1.1) sass-globbing (1.1.1)
sass (>= 3.1) sass (>= 3.1)
@ -35,7 +27,6 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
bootstrap-sass
compass compass
sass sass
sass-globbing sass-globbing

View file

@ -1,10 +1,3 @@
sculpin:
ignore:
- "**/*.scss"
- "**/.sass-cache"
- "**/config.rb"
- "**/Gemfile*"
sculpin_content_types: sculpin_content_types:
posts: posts:
permalink: blog/:slug_title/ permalink: blog/:slug_title/
@ -12,6 +5,3 @@ sculpin_content_types:
- tags - tags
talks: talks:
permalink: talks/:year/:month/:day/:slug_title/ permalink: talks/:year/:month/:day/:slug_title/
sculpin_theme:
theme: opdavies/oliverdavies

View file

@ -1,10 +1,12 @@
title: Oliver Davies title: Oliver Davies
subtitle: Drupal Developer & System Administrator subtitle: Drupal Developer & System Administrator
description: Oliver Davies, Drupal Developer description: Oliver Davies, Drupal Developer
author: Oliver Davies
email: oliver+website@oliverdavies.uk email: oliver+website@oliverdavies.uk
author:
name: Oliver Davies
bio: Oliver Davies is a Drupal Developer and System Administrator based in the UK. He is a Senior Developer at <a href="https://microserve.io">Microserve</a> and also provides freelance consultancy services for Drupal websites, PHP applications and Linux servers.
twitter: twitter:
url: http://twitter.com/opdavies url: http://twitter.com/opdavies
name: opdavies name: opdavies
@ -36,19 +38,52 @@ apple_touch_icon_sizes: [ 57, 114, 72, 144, 60, 120, 76, 152 ]
favicon_sizes: [ 160, 96, 32, 16 ] favicon_sizes: [ 160, 96, 32, 16 ]
main_menu: main_menu:
- { title: Experience, href: /experience/, nav: experience } experience:
- { title: Testimonials, href: /testimonials/, nav: testimonials } title: Experience
- { title: Talks, href: /talks/, nav: talks } href: /experience/
- { title: Blog, href: /blog/, nav: blog } testimonials:
- { title: Contact, href: /contact/, nav: contact } title: Testimonials
href: /testimonials/
talks:
title: Talks
href: /talks/
blog:
title: Blog
href: /blog/
contact:
title: Contact
href: /contact/
meetups: meetups:
swdug: { name: SWDUG, logo: swdug.png, url: http://swdug.org.uk } swdug:
drupalbristol: { name: Drupal Bristol, logo: drupal-bristol.jpeg, url: https://groups.drupal.org/bristol-west-uk } name: SWDUG
phpsw: { name: PHPSW, logo: phpsw.jpeg, url: http://phpsw.uk } logo: swdug.png
swlug: { name: SWLUG, logo: swlug.png, url: http://swlug.org.uk } url: http://swdug.org.uk
accbristol: { name: Accessible Bristol, logo: accessible-bristol.png, url: http://www.accessiblebristol.org.uk }
udiff: { name: Unified Diff, logo: unified-diff.png, url: http://unifieddiff.co.uk } drupalbristol:
name: Drupal Bristol
logo: drupal-bristol.jpeg
url: https://groups.drupal.org/bristol-west-uk
phpsw:
name: PHPSW
logo: phpsw.jpeg
url: http://phpsw.uk
swlug:
name: SWLUG
logo: swlug.png
url: http://swlug.org.uk
accbristol:
name: Accessible Bristol
logo: accessible-bristol.png
url: http://www.accessiblebristol.org.uk
udiff:
name: Unified Diff
logo: unified-diff.png
url: http://unifieddiff.co.uk
hightlightjs_style: default hightlightjs_style: default
digitalocean_referral: a913b4b00d4a digitalocean_referral: a913b4b00d4a

View file

@ -8,10 +8,10 @@
# Location of the theme's resources. # Location of the theme's resources.
sass_dir = "sass" sass_dir = "sass"
css_dir = "css" css_dir = "source/css"
images_dir = "images" images_dir = "source/assets/images"
generated_images_dir = images_dir + "/generated" generated_images_dir = images_dir + "/generated"
javascripts_dir = "js" javascripts_dir = "source/js"
# Require any additional compass plugins installed on your system. # Require any additional compass plugins installed on your system.
require 'sass-globbing' require 'sass-globbing'

View file

@ -3,5 +3,6 @@ body {
} }
main img { main img {
@extend .img-responsive; height: auto;
max-width: 100%;
} }

View file

@ -1,5 +1,4 @@
@import 'compass'; @import 'compass';
@import 'bootstrap';
@import "variables/**/*"; @import "variables/**/*";
@import "base/**/*"; @import "base/**/*";

View file

@ -27,11 +27,11 @@
{% if og.image %} {% if og.image %}
<meta name="twitter:card" content="summary_large_image"/> <meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:image:src" content="{{ og.image.url }}"> <meta name="twitter:image:src" content="{{ og.image.url }}">
<meta name="twitter:creator" content="@opdavies"/> <meta name="twitter:creator" content="@{{ site.twitter.name }}"/>
{% else %} {% else %}
<meta name="twitter:card" content="summary"/> <meta name="twitter:card" content="summary"/>
{% endif %} {% endif %}
<meta name="twitter:title" content="{{ og.title|raw }}"/> <meta name="twitter:title" content="{{ og.title|raw }}"/>
<meta name="twitter:description" content="{{ og.description|raw }}"/> <meta name="twitter:description" content="{{ og.description|raw }}"/>
<meta name="twitter:site" content="@opdavies"/> <meta name="twitter:site" content="@{{ site.twitter.name }}"/>
{% endif %} {% endif %}

View file

@ -18,7 +18,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{{ site.url }}/{{ theme_path('css/styles.css') }}"> <link rel="stylesheet" href="{{ site.url }}/css/styles.css">
<link rel="stylesheet" href="{{ site.url }}/components/bootswatch/cosmo/bootstrap.min.css"> <link rel="stylesheet" href="{{ site.url }}/components/bootswatch/cosmo/bootstrap.min.css">
<link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css"> <link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
<link rel="stylesheet" href="{{ site.url }}/components/font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="{{ site.url }}/components/font-awesome/css/font-awesome.min.css">
@ -46,8 +46,10 @@
<div id="navbar" class="collapse navbar-collapse" role="navigation"> <div id="navbar" class="collapse navbar-collapse" role="navigation">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{% for link in site.main_menu %} {% for name, item in site.main_menu %}
<li class="nav__{{ link.title|lower }}{% if page.nav == link.nav %} active{% endif %}"><a href="{{ link.href }}">{{ link.title }}</a></li> <li{% if page.nav == name %} class="active"{% endif %}>
<a href="{{ item.href }}">{{ item.title }}</a>
</li>
{% endfor %} {% endfor %}
</ul> </ul>
</div>{# .nav-collapse #} </div>{# .nav-collapse #}

View file

@ -2,7 +2,7 @@
{% block content_wrapper %} {% block content_wrapper %}
<main class="col-md-9"> <main class="col-md-9">
{% include 'post_header' %} {% include 'post-header' %}
{% block content %}{% endblock content %} {% block content %}{% endblock content %}
@ -36,7 +36,7 @@
<img src="{{ site.gravatar.url }}?s=50" alt="Picture of Oliver" class="img-circle"> <img src="{{ site.gravatar.url }}?s=50" alt="Picture of Oliver" class="img-circle">
<p><a href="{{ site.url }}">Oliver Davies</a> is a Drupal Developer and System Administrator based in the UK. He is a Senior Developer at <a href="https://microserve.io">Microserve</a> and also provides freelance consultancy services for Drupal websites and Linux servers.</p> <p>{{ site.author.bio|raw }}</p>
</div> </div>
{% if page.next_post or page.previous_post %} {% if page.next_post or page.previous_post %}

View file

@ -14,7 +14,7 @@ use:
<ul class="posts"> <ul class="posts">
{% for post in page.pagination.items %} {% for post in page.pagination.items %}
<li class="post"> <li class="post">
{% include 'post_header' with { page: post, title_tag: 'h2' } %} {% include 'post-header' with { page: post, title_tag: 'h2' } %}
{% if post.blocks.excerpt %} {% if post.blocks.excerpt %}
{{ post.blocks.excerpt|raw }} {{ post.blocks.excerpt|raw }}
@ -28,14 +28,14 @@ use:
</ul> </ul>
{% if page.pagination.previous_page or page.pagination.next_page %} {% if page.pagination.previous_page or page.pagination.next_page %}
<nav> <ul class="pager">
{% if page.pagination.previous_page %} {% if page.pagination.previous_page %}
<a href="{{ site.url }}{{ page.pagination.previous_page.url }}">Newer Items</a> <li class="next"><a href="{{ site.url }}{{ page.pagination.previous_page.url }}">Newer </a></li>
{% endif %} {% endif %}
{% if page.pagination.next_page %} {% if page.pagination.next_page %}
<a href="{{ site.url }}{{ page.pagination.next_page.url }}">Older Items</a> <li class="previous"><a href="{{ site.url }}{{ page.pagination.next_page.url }}">Older</a></li>
{% endif %} {% endif %}
</nav> </ul>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

View file

@ -20,6 +20,7 @@ Here are some other places to find me online:
* IRC ({{ site.irc.name }}) - I'm usually in #drupal-uk and #drupal-contribute on Freenode, among others. * IRC ({{ site.irc.name }}) - I'm usually in #drupal-uk and #drupal-contribute on Freenode, among others.
* <a href="{{ site.twitter.url }}">Twitter</a> (@{{ site.twitter.name }}) * <a href="{{ site.twitter.url }}">Twitter</a> (@{{ site.twitter.name }})
* <a href="{{ site.drupalorg.url_nice }}">Drupal.org</a> * <a href="{{ site.drupalorg.url_nice }}">Drupal.org</a>
* <a href="{{ site.github.url }}">GitHub</a>
* <a href="{{ site.linkedin.url }}">LinkedIn</a> * <a href="{{ site.linkedin.url }}">LinkedIn</a>
* <a href="{{ site.lanyrd.url }}">Lanyrd</a> * <a href="{{ site.lanyrd.url }}">Lanyrd</a>
* <a href="{{ site.joindin.url }}">Joind.in</a> * <a href="{{ site.joindin.url }}">Joind.in</a>

1
source/css/styles.css Normal file
View file

@ -0,0 +1 @@
body{padding-top:60px}main img{height:auto;max-width:100%}dt{margin-top:.5em}dt:after{content:':'}dd{padding-left:2em}table{width:100%}.about-author{overflow:hidden;*zoom:1}.about-author img{float:left;margin:0 1em 1em 0}.copyright{border-top:1px solid #CCC;margin-top:1em;padding-top:1em}.latest-posts li.active a{color:#333;font-weight:500}.block--drupalcon_la img{margin-bottom:.5em}.meetups{overflow:hidden;*zoom:1}.meetups ul{margin:0;padding:0;border:0;overflow:hidden;*zoom:1}.meetups ul li{list-style-image:none;list-style-type:none;margin-left:0;display:inline-block;vertical-align:middle;*vertical-align:auto;*zoom:1;*display:inline;white-space:nowrap}.meetups li{padding:5px 0;margin:0 5px 5px 0}.meetups a{display:block}.meetups img{max-height:45px;width:auto}.page--blog__list ul.posts{list-style:none;margin-bottom:2em;padding-left:0}.page--blog__list .post{overflow:hidden;*zoom:1;border-bottom:1px solid #CCC;margin-bottom:1em;padding-bottom:2em}.page--testimonials .testimonial{overflow:hidden;*zoom:1;margin-bottom:10px}.page--testimonials .testimonial .testimonial__image{float:right;margin:0 0 10px 10px;max-height:100px;max-width:100px}

File diff suppressed because one or more lines are too long