diff --git a/assets/sass/post.sass b/assets/sass/post.sass index 01bc89e5..58df6f28 100644 --- a/assets/sass/post.sass +++ b/assets/sass/post.sass @@ -1,6 +1,3 @@ -.content pre - padding: 0 - pre display: block overflow: auto @@ -30,6 +27,3 @@ code.hljs code[data-gist-id] background: transparent padding: 0 - -.about-author img - width: 50px diff --git a/gulpfile.js b/gulpfile.js index b9531d15..cd26a9b1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -54,17 +54,10 @@ gulp.task('styles', function () { config.sass.sourceDir + '/main.sass' ], 'main.css'); - // app.sass([ - // 'node_modules/prismjs/themes/prism-twilight.css', - // config.sass.sourceDir + '/post.sass' - // ], 'post.css') - - // app.sass(config.sass.sourceDir + '/about.sass', 'about.css'); - // app.sass(config.sass.sourceDir + '/blog.sass', 'blog.css'); - // app.sass(config.sass.sourceDir + '/experience.sass', 'experience.css'); - // app.sass(config.sass.sourceDir + '/project.sass', 'project.css'); - // app.sass(config.sass.sourceDir + '/talk.sass', 'talk.css'); - // app.sass(config.sass.sourceDir + '/testimonials.sass', 'testimonials.css'); + app.sass([ + 'node_modules/prismjs/themes/prism-twilight.css', + config.sass.sourceDir + '/post.sass' + ], 'post.css') }); gulp.task('scripts', function () { diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig index a18c15cf..9e307197 100644 --- a/source/_includes/nav.html.twig +++ b/source/_includes/nav.html.twig @@ -11,19 +11,19 @@ About - + Experience - + Testimonials - + Talks - + Contact diff --git a/source/_includes/post/pager.html.twig b/source/_includes/post/pager.html.twig index bdcc97c0..4c119ff7 100644 --- a/source/_includes/post/pager.html.twig +++ b/source/_includes/post/pager.html.twig @@ -1,7 +1,7 @@
{% if page.previous_post %}
- + « {{ page.previous_post.title }}
@@ -9,7 +9,7 @@ {% if page.next_post %}
- + {{ page.next_post.title }} »
diff --git a/source/_includes/post/tags.html.twig b/source/_includes/post/tags.html.twig index a0cface1..882505e7 100644 --- a/source/_includes/post/tags.html.twig +++ b/source/_includes/post/tags.html.twig @@ -1,7 +1,7 @@ {% if page.tags %}
{% for tag in page.tags %} - + {{- tag -}} {% endfor %} diff --git a/source/_includes/talks-table.html.twig b/source/_includes/talks-table.html.twig index 4b553f8c..0ba9615d 100644 --- a/source/_includes/talks-table.html.twig +++ b/source/_includes/talks-table.html.twig @@ -1,17 +1,17 @@ -
+
- + {% if not talk_page %} - + {% endif %} {% if not upcoming %} - + {% endif %} @@ -61,20 +61,18 @@ {% if not upcoming %} - {% endif %} - {% endfor %} diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index f0f6b112..7fcc20d8 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -24,20 +24,20 @@ {% endfor %} - + {% include 'nav' %}
-
+
{% block content_top %}{% endblock %} {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} {% block content_bottom %}{% endblock %}
{% block sidebar_wrapper %} -
+
{% block sidebar %} {% include 'badges' %} {% include 'availability' %} @@ -50,7 +50,7 @@

- © 2010-{{ 'now'|date('Y') }} {{ site.title }}. Built with Sculpin, Bulma and Gulp. + © 2010-{{ 'now'|date('Y') }} {{ site.title }}. Built with Sculpin.

{% include 'meetups' %} diff --git a/source/experience.html.twig b/source/experience.html.twig index c558a66f..19dc9c65 100644 --- a/source/experience.html.twig +++ b/source/experience.html.twig @@ -12,7 +12,7 @@ redirect: {% for experience in site.experiences|reverse %} {% set company = site.companies[experience.company] %} -
+
{% if company.logo %}
{{ company.name }} logo @@ -20,11 +20,11 @@ redirect: {% endif %}
-

{{ company.name }}

+

{{ company.name }}

{% if company.url -%} - + {{- company.url -}} {%- endif %} diff --git a/source/testimonials.html.twig b/source/testimonials.html.twig index 93c9bcb3..a3037686 100644 --- a/source/testimonials.html.twig +++ b/source/testimonials.html.twig @@ -5,13 +5,13 @@ use: [posts] testimonials: - name: Ed Welsby image: ed-welsby.png - role: Senior Developer at Proctor & Stevenson + role: Senior Developer at Proctor & Stevenson text: | Oliver was great to work with, he has a solid knowledge of the various aspects of web development and never minded helping me out with Linux commands! - name: Brian Healy image: brian-healy.png - role: Director of Business Development at Tincan. + role: Director of Business Development at Tincan. text: | Oliver was fantastic to work with - pro-active and highly responsive, he worked well remotely and as part of a project team. His understanding of the project requirement(s) and ability to translate it into working code was essential and he delivered. @@ -31,21 +31,21 @@ testimonials: Oliver is seasoned Drupal and all round highly skilled and experienced web developer. I have worked with Oliver on an important project where he was reliable, prompt and ensured strict client deadline delivery and confidentiality at all times. - name: James Chapman - role: Director at Development Done Right + role: Director at Development Done Right image: james-chapman.png text: | We used Oliver on a number of occasions throughout 2012 and I have to say we've been delighted with his work. His skills working with Drupal are excellent particularly with custom module development and we wouldn’t hesitate to recommend him others. - name: Léonie Watson role: > - Director of Accessibility at Nomensa + Director of Accessibility at Nomensa image: leonie-watson.jpg text: | Oliver is a flexible and hardworking developer, with a terrific knowledge of Drupal. He promotes accessibility best practice within the Drupal community, and is always happy to share his knowledge with other people. - name: Holly Ross role: > - Executive Director at the Drupal Association + Executive Director at the Drupal Association image: holly-ross.png text: | Oliver has been an outstanding contributor to the Drupal Association team. He is a talented developer who writes great code and applies his curiosity and love of learning to every project. He is also a fantastic team member, who gives to the team as much as he gets. @@ -53,7 +53,7 @@ testimonials: Oliver is the embodiment of everything good about the Drupal community. - name: Josh Mitchell - role: CTO at the Drupal Association + role: CTO at the Drupal Association image: josh-mitchell.png text: | Oliver is a skilled Drupal developer with a passion for the Drupal community. As his direct supervisor, I was able to watch Oliver grow with the Drupal Association and contribute an amazing amount of effort and integrity to all of his work. @@ -62,14 +62,14 @@ testimonials: - name: Chris Jarvis image: chris-jarvis.jpg - role: Developer at Microserve + role: Developer at Microserve text: | Oliver is an amazing colleague, he's professional, full of knowledge and I could not recommend him more. --- {% block content %} {% for testimonial in page.testimonials|reverse %}
-

{{ testimonial.name }}

+

{{ testimonial.name }}

{% if testimonial.image %} +
{{ testimonial.role|raw }}
{% endif %}
DateDateTalkTalkEventFeedbackFeedback
+ {% if row.date.feedback %} + title="Read or leave feedback for this talk"> joind.in {% endif %}