Merge branch 'use-bulma' into source
This commit is contained in:
commit
b19b82a5d6
|
|
@ -1,4 +1,9 @@
|
|||
(function ($) {
|
||||
// Update the HTML classes.
|
||||
$('html.no-js').removeClass('no-js').addClass('js');
|
||||
$('html.no-js').addClass('js').removeClass('no-js');
|
||||
|
||||
$('.nav-toggle').on('click', function (e) {
|
||||
e.preventDefault();
|
||||
|
||||
$(this).siblings('.nav-right').toggleClass('is-active');
|
||||
})
|
||||
})(jQuery);
|
||||
|
|
|
|||
|
|
@ -1,18 +1,9 @@
|
|||
.bg-red
|
||||
background: red
|
||||
|
||||
body
|
||||
padding-top: 60px
|
||||
|
||||
main
|
||||
a:link,
|
||||
a:hover
|
||||
border-bottom: 1px solid
|
||||
text-decoration: none
|
||||
|
||||
img
|
||||
@extend .img-responsive
|
||||
|
||||
p img
|
||||
margin: 1.5em 0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,35 +1,35 @@
|
|||
=from($device)
|
||||
@media screen and (min-width: $device)
|
||||
@content
|
||||
// =from($device)
|
||||
// @media screen and (min-width: $device)
|
||||
// @content
|
||||
|
||||
=until($device)
|
||||
@media screen and (max-width: $device - 1px)
|
||||
@content
|
||||
// =until($device)
|
||||
// @media screen and (max-width: $device - 1px)
|
||||
// @content
|
||||
|
||||
=mobile
|
||||
@media screen and (max-width: $screen-tablet - 1px)
|
||||
@content
|
||||
// =mobile
|
||||
// @media screen and (max-width: $screen-tablet - 1px)
|
||||
// @content
|
||||
|
||||
=tablet
|
||||
@media screen and (min-width: $screen-tablet)
|
||||
@content
|
||||
// =tablet
|
||||
// @media screen and (min-width: $screen-tablet)
|
||||
// @content
|
||||
|
||||
=tablet-only
|
||||
@media screen and (min-width: $screen-tablet) and (max-width: $screen-desktop - 1px)
|
||||
@content
|
||||
// =tablet-only
|
||||
// @media screen and (min-width: $screen-tablet) and (max-width: $screen-desktop - 1px)
|
||||
// @content
|
||||
|
||||
=touch
|
||||
@media screen and (max-width: $screen-desktop - 1px)
|
||||
@content
|
||||
// =touch
|
||||
// @media screen and (max-width: $screen-desktop - 1px)
|
||||
// @content
|
||||
|
||||
=desktop
|
||||
@media screen and (min-width: $screen-desktop)
|
||||
@content
|
||||
// =desktop
|
||||
// @media screen and (min-width: $screen-desktop)
|
||||
// @content
|
||||
|
||||
=desktop-only
|
||||
@media screen and (min-width: $screen-desktop) and (max-width: $screen-lg - 1px)
|
||||
@content
|
||||
// =desktop-only
|
||||
// @media screen and (min-width: $screen-desktop) and (max-width: $screen-lg - 1px)
|
||||
// @content
|
||||
|
||||
=widescreen
|
||||
@media screen and (min-width: $screen-lg)
|
||||
@content
|
||||
// =widescreen
|
||||
// @media screen and (min-width: $screen-lg)
|
||||
// @content
|
||||
|
|
|
|||
|
|
@ -11,15 +11,15 @@
|
|||
flex-wrap: wrap
|
||||
|
||||
.list-style-none
|
||||
list-style: none
|
||||
list-style: none !important
|
||||
|
||||
.align-items-center
|
||||
align-items: center
|
||||
|
||||
@each $value in 'block', 'inline', 'inline-block', 'flex'
|
||||
.display-#{$value},
|
||||
.is-#{$value},
|
||||
display: #{$value}
|
||||
//@each $value in 'block', 'inline', 'inline-block', 'flex'
|
||||
// .display-#{$value},
|
||||
// .is-#{$value},
|
||||
// display: #{$value}
|
||||
|
||||
@each $value in 'top', 'middle', 'bottom'
|
||||
.table
|
||||
|
|
@ -32,6 +32,8 @@
|
|||
&.vertical-#{$value}
|
||||
vertical-align: #{$value}
|
||||
|
||||
@each $value in 2, 3, 4, 5
|
||||
.is-#{$value}
|
||||
width: calc(100% / #{$value})
|
||||
$properties: ( mb: 'margin-bottom', ml: 'margin-left', mr: 'margin-right', mt: 'margin-top', pb: 'padding-bottom', pl: 'padding-left', pr: 'padding-right', pt: 'padding-top' )
|
||||
@each $key, $property in $properties
|
||||
@for $value from 1 through 5
|
||||
.#{$key}-#{$value}
|
||||
#{$property}: #{$value}em !important
|
||||
|
|
|
|||
5
assets/sass/base/_utilities.sass
Normal file
5
assets/sass/base/_utilities.sass
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
.is-borderless
|
||||
border: none !important
|
||||
|
||||
.is-circle
|
||||
border-radius: 50%
|
||||
|
|
@ -1,10 +1,20 @@
|
|||
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap'
|
||||
@import 'node_modules/bulma/sass/utilities/initial-variables'
|
||||
|
||||
$family-sans-serif: "Helvetica Neue", Arial, sans-serif
|
||||
$body-size: 14px
|
||||
|
||||
$blue: #0678BE
|
||||
|
||||
$primary: $blue
|
||||
|
||||
@import 'node_modules/bulma/bulma'
|
||||
|
||||
@import 'base'
|
||||
@import 'mixins'
|
||||
|
||||
@import 'base/layout'
|
||||
@import 'base/typography'
|
||||
@import 'base/utilities'
|
||||
|
||||
@import 'components/availability'
|
||||
@import 'components/badges'
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
|
||||
|
||||
.page--blog__list
|
||||
ul.posts
|
||||
list-style: none
|
||||
//list-style: none
|
||||
margin-bottom: 2em
|
||||
padding-left: 0
|
||||
margin-left: 0
|
||||
margin-top: 0
|
||||
//padding-left: 0
|
||||
|
||||
.post
|
||||
+clearfix
|
||||
border-bottom: 1px solid #CCC
|
||||
margin-bottom: 1em
|
||||
padding-bottom: 2em
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
|
||||
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
|
||||
@import '../mixins'
|
||||
|
||||
.experience-item
|
||||
margin-bottom: $padding-large-vertical * 3
|
||||
// margin-bottom: $padding-large-vertical * 3
|
||||
+clearfix
|
||||
|
||||
.experience-item-website
|
||||
|
|
|
|||
|
|
@ -1,12 +1,3 @@
|
|||
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
|
||||
|
||||
.post-pager
|
||||
clear: both
|
||||
margin-top: 2em
|
||||
|
||||
.post-pager div
|
||||
flex: 1
|
||||
|
||||
pre
|
||||
display: block
|
||||
overflow: auto
|
||||
|
|
@ -16,7 +7,6 @@ pre
|
|||
pre[class*="language-"]
|
||||
border: 0
|
||||
border-radius: 0
|
||||
margin: 1.5em 0
|
||||
|
||||
pre code
|
||||
white-space: pre
|
||||
|
|
@ -30,10 +20,5 @@ code[data-gist-id]
|
|||
background: transparent
|
||||
padding: 0
|
||||
|
||||
.about-author
|
||||
+clearfix
|
||||
|
||||
img
|
||||
float: left
|
||||
margin: 0 1em 1em 0
|
||||
width: 50px
|
||||
.about-author img
|
||||
width: 50px
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
|
||||
@import '../mixins'
|
||||
|
||||
.project-company
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
|
||||
@import '../mixins'
|
||||
|
||||
.talk-full h1
|
||||
margin-bottom: 25px
|
||||
|
||||
.presentation
|
||||
.talk-slides
|
||||
background: url('../images/loading.gif') no-repeat center
|
||||
min-height: 275px
|
||||
width: 100%
|
||||
|
|
|
|||
|
|
@ -1,16 +1,3 @@
|
|||
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
|
||||
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
|
||||
@import '../mixins'
|
||||
|
||||
.testimonial
|
||||
+clearfix
|
||||
margin-bottom: 10px
|
||||
|
||||
&__image
|
||||
height: 75px
|
||||
margin: 0 0 10px 10px
|
||||
width: 75px
|
||||
|
||||
+until($screen-sm)
|
||||
height: 90px
|
||||
width: 90px
|
||||
.testimonial-image
|
||||
height: 75px
|
||||
width: 75px
|
||||
|
|
|
|||
|
|
@ -31,10 +31,9 @@ gulp.task('styles',
|
|||
gulp.task('scripts',
|
||||
addScript([
|
||||
'node_modules/jquery/dist/jquery.js',
|
||||
'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
|
||||
'node_modules/prismjs/prism.js',
|
||||
'node_modules/prismjs/components/prism-{apacheconf,bash,css,diff,ini,json,nginx,php,sass,scss,sql,less,twig,xml,yaml}.js',
|
||||
config.js.sourceDir + config.js.pattern
|
||||
'node_modules/prismjs/components/prism-{apacheconf,bsash,css,diff,ini,json,nginx,php,sass,scss,sql,less,twig,xml,yaml}.js',
|
||||
config.js.sourceDir + '/**/*.js'
|
||||
], 'site.js')
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"bootstrap-sass": "^3.3.7",
|
||||
"bulma": "^0.5.0",
|
||||
"del": "^3.0.0",
|
||||
"font-awesome": "^4.7.0",
|
||||
"gulp": "^3.9.1",
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
<div class="availability panel panel-default">
|
||||
<div class="panel-heading">Availability</div>
|
||||
|
||||
<div class="panel-body">
|
||||
{% for key, availability in site.availability %}
|
||||
{% include 'availability/' ~ availability with { value: key } %}
|
||||
{% endfor %}
|
||||
<div class="panel-block">
|
||||
<div>
|
||||
{% for key, availability in site.availability %}
|
||||
{% include 'availability/' ~ availability with { value: key } %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<p>
|
||||
<i class="fa fa-thumbs-o-up text-warning"></i>
|
||||
<span class="icon is-small">
|
||||
<i class="fa fa-thumbs-o-up is-warning"></i>
|
||||
</span>
|
||||
|
||||
{{ value == 'full' ? 'Currently have limited full-time capacity' }}
|
||||
{{ value == 'part' ? 'Currently have limited part-time capacity' }}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<p>
|
||||
<i class="fa fa-thumbs-o-down text-danger"></i>
|
||||
<span class="icon is-small">
|
||||
<i class="fa fa-thumbs-o-down is-danger"></i>
|
||||
</span>
|
||||
|
||||
{{ value == 'full' ? 'Currently no spare full-time capacity.' }}
|
||||
{{ value == 'part' ? 'Currently no spare part-time capacity.' }}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<p>
|
||||
<i class="fa fa-thumbs-o-up text-success"></i>
|
||||
<span class="icon is-small">
|
||||
<i class="fa fa-thumbs-o-up is-success"></i>
|
||||
</span>
|
||||
|
||||
{{ value == 'full' ? 'Currently have available full-time capacity' }}
|
||||
{{ value == 'part' ? 'Currently have available part-time capacity' }}
|
||||
|
|
|
|||
|
|
@ -1,41 +1,41 @@
|
|||
<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>
|
||||
|
||||
<div id="navbar" class="collapse navbar-collapse" role="navigation">
|
||||
<ul class="nav navbar-nav">
|
||||
<li class="{{ page.url == '/.' ? 'active' }}">
|
||||
<a href="/">About</a>
|
||||
</li>
|
||||
|
||||
<li class="{{ page.url == '/experience' ? 'active' }}">
|
||||
<a href="/experience">Experience</a>
|
||||
</li>
|
||||
|
||||
<li class="{{ page.url == '/testimonials' ? 'active' }}">
|
||||
<a href="/testimonials">Testimonials</a>
|
||||
</li>
|
||||
|
||||
<li class="{{ page.url == '/talks' or '/talks/' in page.url ? 'active' }}">
|
||||
<a href="/talks">Talks</a>
|
||||
</li>
|
||||
|
||||
<li class="{{ page.url == '/blog' or '/blog/' in page.url ? 'active' }}">
|
||||
<a href="/blog">Blog</a>
|
||||
</li>
|
||||
|
||||
<li class="{{ page.url == '/contact' or '/contact/' in page.url ? 'active' }}">
|
||||
<a href="/contact">Contact</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>{# .nav-collapse #}
|
||||
<nav class="nav has-shadow" id="top">
|
||||
<div class="container">
|
||||
<div class="nav-left">
|
||||
<a class="nav-item">
|
||||
<div class="nav-item">{{ site.title }}</div>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<span class="nav-toggle">
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
</span>
|
||||
|
||||
<div class="nav-right nav-menu">
|
||||
<a class="nav-item is-tab {{ page.url == '/.' ? 'is-active' }}" href="/">
|
||||
About
|
||||
</a>
|
||||
|
||||
<a class="nav-item is-tab {{ page.url == '/experience' ? 'is-active' }}" href="/experience">
|
||||
Experience
|
||||
</a>
|
||||
|
||||
<a class="nav-item is-tab {{ page.url == '/testimonials' ? 'is-active' }}" href="/testimonials">
|
||||
Testimonials
|
||||
</a>
|
||||
|
||||
<a class="nav-item is-tab {{ page.url == '/talks' or '/talks/' in page.url ? 'is-active' }}" href="/talks">
|
||||
Talks
|
||||
</a>
|
||||
|
||||
<a class="nav-item is-tab {{ page.url == '/blog' or '/blog/' in page.url ? 'is-active' }}" href="/blog">
|
||||
Blog
|
||||
</a>
|
||||
|
||||
<a class="nav-item is-tab {{ page.url == '/contact' or '/contact/' in page.url ? 'is-active' }}" href="/contact">
|
||||
Contact
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<div class="about-author">
|
||||
<div class="about-author is-clearfix mt-2">
|
||||
<h2>About the Author</h2>
|
||||
|
||||
<img src="{{ site.images_url }}{{ site.avatar.url }}" alt="Picture of Oliver" class="img-circle">
|
||||
<img src="{{ site.images_url }}{{ site.avatar.url }}" alt="Picture of Oliver" class="is-circle is-pulled-left mr-1 mb-1">
|
||||
|
||||
<p>Oliver Davies is a Web Developer, System Administrator and Drupal specialist based in the UK. He is a {{ site.work.role }} at <a href="{{ site.companies[site.work.company].url }}">{{ site.companies[site.work.company].name }}</a> and also provides freelance consultancy services for Drupal websites, PHP applications and Linux servers.</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div class="post-pager is-flex">
|
||||
<div class="post-pager is-clearfix is-flex mt-2">
|
||||
{% if page.previous_post %}
|
||||
<div class="is-half">
|
||||
<div class="is-half flex">
|
||||
<a href="{{ page.previous_post.url }}">
|
||||
« {{ page.previous_post.title }}
|
||||
</a>
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
{% endif %}
|
||||
|
||||
{% if page.next_post %}
|
||||
<div class="is-half text-right">
|
||||
<div class="is-half flex has-text-right">
|
||||
<a href="{{ page.next_post.url }}">
|
||||
{{ page.next_post.title }} »
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{% if page.tags %}
|
||||
<p class="tags">
|
||||
Tags:
|
||||
<div class="tags">
|
||||
{% for tag in page.tags %}
|
||||
<a href="{{ site.url }}/blog/tags/{{ tag|url_encode(true) }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
|
||||
<a href="{{ site.url }}/blog/tags/{{ tag|url_encode(true) }}" class="tag is-light is-borderless">
|
||||
{{- tag -}}
|
||||
</a>
|
||||
{% endfor %}
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
<div class="latest-posts panel panel-default">
|
||||
<div class="latest-posts__heading panel-heading">Latest blog posts</div>
|
||||
|
||||
<ul class="list-group">
|
||||
{% for post in data.posts|slice(0, site.latest_posts) %}
|
||||
<li class="post list-group-item">
|
||||
{% for post in data.posts|slice(0, site.latest_posts) %}
|
||||
<div class="post panel-block">
|
||||
<div>
|
||||
<span class="post__title">
|
||||
<a href="{{ post.url }}">
|
||||
{{ post.title }}
|
||||
</a>
|
||||
</span> -
|
||||
<span class="post__date">{{ post.date|date(site.default_date_format) }}</span>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<div class="table-responsive">
|
||||
<table class="table table-striped talks-table">
|
||||
<table class="talks-table table is-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 20%">Date</th>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
{{ row.date.date|date(row.date.fuzzy_date ? 'F Y' : 'j F Y') }}
|
||||
|
||||
{% if row.date.time %}
|
||||
<small class="display-block">{{ row.date.time }}</small>
|
||||
<small class="is-block">{{ row.date.time }}</small>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
<a href="{{ talk.url }}">{{ talk.title }}</a>
|
||||
{% endif %}
|
||||
|
||||
<small class="display-block">
|
||||
<small class="is-block">
|
||||
{{ row.date.talk.type ?: talk.type }}
|
||||
</small>
|
||||
</td>
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
{{ row.event.name }}
|
||||
{% endif %}
|
||||
|
||||
<small class="display-block">
|
||||
<small class="is-block">
|
||||
{{ row.event.location }}
|
||||
</small>
|
||||
</td>
|
||||
|
|
@ -65,10 +65,13 @@
|
|||
{% if row.date.feedback %}
|
||||
<a
|
||||
href="{{ row.date.feedback }}"
|
||||
class="btn btn-primary"
|
||||
class="button is-primary"
|
||||
title="Read or leave feedback for this talk"
|
||||
>
|
||||
<i class="fa fa-comment-o"></i> joind.in
|
||||
<!-- <span class="icon is-small">
|
||||
<i class="fa fa-comment-o" style="margin-right: 8px"></i>
|
||||
</span> -->
|
||||
joind.in
|
||||
</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -27,34 +27,38 @@
|
|||
<body class="{{ page.blocks.body_classes }}">
|
||||
{% include 'nav' %}
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<main class="col-md-9">
|
||||
{% block content_top %}{% endblock %}
|
||||
{% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
|
||||
{% block content_bottom %}{% endblock %}
|
||||
</main>
|
||||
<section class="section">
|
||||
<div class="container">
|
||||
<div class="columns">
|
||||
<main class="content column is-9">
|
||||
{% block content_top %}{% endblock %}
|
||||
{% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
|
||||
{% block content_bottom %}{% endblock %}
|
||||
</main>
|
||||
|
||||
{% block sidebar_wrapper %}
|
||||
<div class="col-md-3">
|
||||
{% block sidebar %}
|
||||
{% include 'badges' %}
|
||||
{% include 'availability' %}
|
||||
{% include 'posts/latest' %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block sidebar_wrapper %}
|
||||
<div class="column is-3">
|
||||
{% block sidebar %}
|
||||
{% include 'badges' %}
|
||||
{% include 'availability' %}
|
||||
{% include 'posts/latest' %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
</div>{# .row #}
|
||||
</div>{# .container #}
|
||||
</div>{# .row #}
|
||||
</div>{# .container #}
|
||||
</section>
|
||||
|
||||
<footer class="container">
|
||||
<p class="copyright">
|
||||
© 2010-{{ 'now'|date('Y') }} {{ site.title }}. Built with <a href="https://sculpin.io">Sculpin</a>.
|
||||
</p>
|
||||
<section class="section">
|
||||
<footer class="container content">
|
||||
<p class="copyright">
|
||||
© 2010-{{ 'now'|date('Y') }} {{ site.title }}. Built with <a href="https://sculpin.io">Sculpin</a>, <a href="http://bulma.io">Bulma</a> and <a href="https://gulpjs.com">Gulp</a>.
|
||||
</p>
|
||||
|
||||
{% include 'meetups' %}
|
||||
</footer>
|
||||
{% include 'meetups' %}
|
||||
</footer>
|
||||
</section>
|
||||
|
||||
<script src="{{ site.url }}/assets/js/site.js"></script>
|
||||
|
||||
|
|
@ -62,6 +66,6 @@
|
|||
<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>
|
||||
{% endif %}
|
||||
|
||||
{% block scripts '' %}
|
||||
{% block scripts %}{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,35 +1,31 @@
|
|||
{% extends 'default' %}
|
||||
{% extends 'page' %}
|
||||
|
||||
{% block body_classes 'talk talk-full' %}
|
||||
|
||||
{% block content_top %}
|
||||
<h1>{{ page.title }}</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% block content_wrapper %}
|
||||
<div class="talk-description">
|
||||
<div>
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
|
||||
{% if page.slides.embed %}
|
||||
<div class="talk-slides">
|
||||
<div class="mt-2">
|
||||
<h2>Slides</h2>
|
||||
<div class="presentation">
|
||||
<div class="talk-slides">
|
||||
{{ page.slides.embed|raw }}
|
||||
</div>{# .presentation #}
|
||||
</div>{# .talk-slides #}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if page.video.embed %}
|
||||
<div class="talk-video">
|
||||
<div class="mt-2">
|
||||
<h2>Video</h2>
|
||||
<div class="embed-container">
|
||||
{{ page.video.embed|raw }}
|
||||
</div>
|
||||
</div>{# .talk-video #}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="talk-events">
|
||||
<div class="mt-3">
|
||||
<h2>Events</h2>
|
||||
|
||||
{% set events = [] %}
|
||||
|
|
@ -48,5 +44,5 @@
|
|||
events: events,
|
||||
talk_page: true,
|
||||
} %}
|
||||
</div>{# .talk-events #}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,9 @@ meta:
|
|||
slug: drupalcamp-bristol-early-bird-tickets-sessions-sponsors
|
||||
---
|
||||
{% block excerpt %}
|
||||
<img src="/assets/images/blog/drupalcamp-bristol-17-logo.jpg" alt="DrupalCamp Bristol 2017 logo" class="is-centered">
|
||||
<div class="has-text-centered">
|
||||
<img src="/assets/images/blog/drupalcamp-bristol-17-logo.jpg" alt="DrupalCamp Bristol 2017 logo">
|
||||
</div>
|
||||
|
||||
In less than two months time, [DrupalCamp Bristol][0] will be back for our third year! (July seems to come around quicker each year). This is this year’s schedule and venues:
|
||||
|
||||
|
|
|
|||
|
|
@ -11,12 +11,13 @@ meta:
|
|||
width: 451
|
||||
---
|
||||
{% block excerpt %}
|
||||
<img
|
||||
src="/assets/images/blog/jackson-octocat.png"
|
||||
alt=""
|
||||
class="is-centered"
|
||||
style="margin-bottom: 20px"
|
||||
>
|
||||
<div class="has-text-centered">
|
||||
<img
|
||||
src="/assets/images/blog/jackson-octocat.png"
|
||||
alt=""
|
||||
style="margin-bottom: 20px"
|
||||
>
|
||||
</div>
|
||||
|
||||
Earlier this week I moved this site from my personal Linode server to [GitHub Pages][0].
|
||||
|
||||
|
|
@ -24,12 +25,13 @@ This made sense as I already kept the source code in [on GitHub][1], the issue w
|
|||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<img
|
||||
src="/assets/images/blog/jackson-octocat.png"
|
||||
alt=""
|
||||
class="is-centered"
|
||||
style="margin-bottom: 20px"
|
||||
>
|
||||
<div class="has-text-centered">
|
||||
<img
|
||||
src="/assets/images/blog/jackson-octocat.png"
|
||||
alt=""
|
||||
style="margin-bottom: 20px"
|
||||
>
|
||||
</div>
|
||||
|
||||
Earlier this week I moved this site from my personal Linode server to [GitHub Pages][0].
|
||||
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ use: [posts]
|
|||
{% block content %}
|
||||
<h1>Blog</h1>
|
||||
|
||||
<ul class="posts">
|
||||
<ul class="posts list-style-none">
|
||||
{% for post in page.pagination.items %}
|
||||
<li class="post">
|
||||
<li class="post is-clearfix mb-2 pb-3">
|
||||
{{ include('post/header', {
|
||||
page: post,
|
||||
title_tag: 'h2'
|
||||
|
|
|
|||
|
|
@ -7,29 +7,39 @@ use: [posts]
|
|||
<p>To send me an email, complete the form below.</p>
|
||||
|
||||
<form action="https://formspree.io/{{ site.email }}" method="POST">
|
||||
<div class="form__name form-group">
|
||||
<div class="form__name field">
|
||||
<label for="name">Name</label>
|
||||
<input type="text" class="form-control" name="name" required>
|
||||
<div class="control">
|
||||
<input type="text" class="input" name="name" required>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form__email form-group">
|
||||
<div class="form__email field">
|
||||
<label for="email">Email</label>
|
||||
<input type="email" class="form-control" name="email" required>
|
||||
<div class="control">
|
||||
<input type="email" class="input" name="email" required>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form__subject form-group">
|
||||
<div class="form__subject field">
|
||||
<label for="subject">Subject</label>
|
||||
<input type="text" class="form-control" name="subject" required>
|
||||
<div class="control">
|
||||
<input type="text" class="input" name="subject" required>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form__message form-group">
|
||||
<label for="message">Message</label>
|
||||
<textarea name="message" class="form-control" rows="5" required></textarea>
|
||||
<div class="field">
|
||||
<div class="control">
|
||||
<label for="message">Message</label>
|
||||
<textarea name="message" class="textarea" rows="5" required></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form__actions">
|
||||
<button class="btn btn-primary" type="submit">
|
||||
<i class="fa fa-send"></i>
|
||||
<button class="button is-primary" type="submit">
|
||||
<span class="icon is-small" style="margin-right: 5px">
|
||||
<i class="fa fa-send"></i>
|
||||
</span>
|
||||
Send email
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ redirect:
|
|||
{% for experience in site.experiences|reverse %}
|
||||
{% set company = site.companies[experience.company] %}
|
||||
|
||||
<div class="experience-item{% if company.logo %} has-logo{% endif %}">
|
||||
<div class="experience-item{% if company.logo %} has-logo{% endif %} mb-3">
|
||||
{% if company.logo %}
|
||||
<div class="experience-item-logo">
|
||||
<img src="{{ site.images_url }}/assets/images/experience/{{ company.logo }}" alt="{{ company.name }} logo">
|
||||
|
|
@ -20,10 +20,10 @@ redirect:
|
|||
{% endif %}
|
||||
|
||||
<div class="experience-item-inner">
|
||||
<h2>{{ company.name }}</h2>
|
||||
<h2 class="is-marginless">{{ company.name }}</h2>
|
||||
|
||||
{% if company.url -%}
|
||||
<a class="experience-item-website display-inline-block" href="{{ company.url }}">
|
||||
<a class="experience-item-website is-inline-block" href="{{ company.url }}">
|
||||
{{- company.url -}}
|
||||
</a>
|
||||
{%- endif %}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ redirect:
|
|||
{% block content %}
|
||||
# About Me
|
||||
|
||||
<img src="{{ site.images_url }}{{ site.avatar.url }}" alt="Picture of Oliver" class="me img-circle">
|
||||
<img src="{{ site.images_url }}{{ site.avatar.url }}" alt="Picture of Oliver" class="me is-circle is-marginless">
|
||||
|
||||
My name is Oliver Davies (aka [opdavies][1]) - a full-stack Web Developer and System Administrator based in Wales, UK.
|
||||
|
||||
|
|
|
|||
|
|
@ -5,24 +5,26 @@ use: [posts]
|
|||
---
|
||||
{% block content %}
|
||||
{% for testimonial in site.testimonials|reverse %}
|
||||
<article class="testimonial">
|
||||
<h2 class="testimonial__name">{{ testimonial.name }}</h2>
|
||||
<article class="is-clearfix mb-3">
|
||||
<h2 class="is-marginless">{{ testimonial.name }}</h2>
|
||||
|
||||
{% if testimonial.image %}
|
||||
<img
|
||||
class="testimonial__image pull-right img-circle"
|
||||
src="{{ site.url }}/assets/images/testimonials/{{ testimonial.image }}"
|
||||
class="testimonial-image is-pulled-right is-circle ml-2 mb-1"
|
||||
alt="{{ testimonial.name }}"
|
||||
/>
|
||||
>
|
||||
{% endif %}
|
||||
|
||||
{% if testimonial.role %}
|
||||
<div class="testimonial__role text-light">
|
||||
<div class="text-light">
|
||||
{{ testimonial.role|markdown }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{{ testimonial.text|markdown }}
|
||||
<div class="mt-1">
|
||||
{{ testimonial.text|markdown }}
|
||||
</div>
|
||||
</article>
|
||||
{% endfor %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -216,10 +216,6 @@ boom@2.x.x:
|
|||
dependencies:
|
||||
hoek "2.x.x"
|
||||
|
||||
bootstrap-sass@^3.3.7:
|
||||
version "3.3.7"
|
||||
resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498"
|
||||
|
||||
brace-expansion@^1.0.0:
|
||||
version "1.1.6"
|
||||
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
|
||||
|
|
@ -257,6 +253,10 @@ builtin-modules@^1.0.0:
|
|||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
|
||||
|
||||
bulma:
|
||||
version "0.5.0"
|
||||
resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.5.0.tgz#09a7932c1c15aa7ef92840f7a50b1bfebbfd5461"
|
||||
|
||||
bytes@2.2.0:
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.2.0.tgz#fd35464a403f6f9117c2de3609ecff9cae000588"
|
||||
|
|
|
|||
Reference in a new issue