opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Oliver Davies 2015-04-19 21:19:02 +01:00
commit 71fe366450
112 changed files with 701 additions and 600 deletions
Download patch file Download diff file Expand all files Collapse all files

26
source/themes/opdavies/opdavies/_layouts/default.html.twig
View file

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en" class="no-js">
<html lang="en-GB" class="no-js">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -7,9 +7,9 @@
{% 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" />
<title>{% if (page.front == true) and (site.subtitle) %}{{ site.subtitle }}{% else %}{{ page.title }}{% endif %} | {{ site.title }}</title>
{% include 'title' %}
<link rel="stylesheet" href="{{ site.url }}/{{ theme_path('assets/css/styles.css') }}">
{% block styles %}{% endblock %}
</head>
@ -18,26 +18,18 @@
<div class="container">
<div class="row">
{% block content_wrapper %}
<div class="col-md-9">
<div class="col-md-12">
{% block content_wrapper %}
{% block content %}{% endblock %}
</div>
{% endblock %}
{% block sidebar %}
<div class="col-md-3">
{% include 'latest-posts' %}
</div>
{% endblock %}
{% endblock %}
</div>
</div>{# .row #}
</div>{# .container #}
<footer class="container" role="contentinfo">
<p class="copyright">&copy; 2010&ndash;{{ 'now'|date('Y') }} {{ site.title }}</p>
<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>
</html>
</html>

22
source/themes/opdavies/opdavies/_layouts/post.html.twig
View file

@ -1,8 +1,22 @@
{% extends 'default' %}
{% block content_wrapper %}
<div class="col-md-9">
{% include 'post-header' %}
{% block content %}{% endblock %}
</div>{# .col-md-9 #}
{% 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.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 %}

10
source/themes/opdavies/opdavies/_partials/navbar.html.twig
View file

@ -12,12 +12,10 @@
<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>
<li{% if page.nav == 'work' %} class="active"{% endif %}><a href="{{ site.url }}/work">Work</a></li>
<li{% if page.nav == 'services' %} class="active"{% endif %}><a href="{{ site.url }}/services">Services</a></li>
<li{% if page.nav == 'talks' %} class="active"{% endif %}><a href="{{ site.url }}/talks">Talks</a></li>
<li{% if page.nav == 'blog' %} class="active"{% endif %}><a href="{{ site.url }}/blog">Blog</a></li>
<li{% if page.nav == 'contact' %} class="active"{% endif %}><a href="{{ site.url }}/contact">Contact</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>
</nav>

37
source/themes/opdavies/opdavies/_partials/og.html.twig Normal file
View file

@ -0,0 +1,37 @@
{% if og.title %}
<meta property="og:title" content="{{ og.title|raw }}"/>
{% endif %}
{% if og.description %}
<meta property="og:description" content="{{ og.description|raw }}"/>
{% endif %}
{% if 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 %}
{% 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" />
{% endif %}

2
source/themes/opdavies/opdavies/_partials/talk-listing-item.html.twig Normal file
View file

@ -0,0 +1,2 @@
<dt>{{ talk.date|date('F Y') }} - {{ talk.location }}</dt>
<dd>{{ talk.description|raw }}</dd>

14
source/themes/opdavies/opdavies/_partials/title.html.twig Normal file
View file

@ -0,0 +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 }}
{% endif %}
{% endif %}
</title>{% endspaceless %}

2
source/themes/opdavies/opdavies/assets/css/styles.css
View file

File diff suppressed because one or more lines are too long

3
source/themes/opdavies/opdavies/assets/sass/base/_tables.scss Normal file
View file

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