From 0692d8ff00cdb017b7421bc838833be4c1365e71 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 11 Jul 2017 18:56:05 +0100 Subject: [PATCH] Use utility classes --- assets/sass/base/_typography.sass | 3 +++ assets/sass/experience.sass | 2 -- assets/sass/testimonials.sass | 3 --- source/_includes/post/header.html.twig | 4 ++-- source/experience.html.twig | 4 ++-- source/testimonials.html.twig | 10 +++++++--- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/assets/sass/base/_typography.sass b/assets/sass/base/_typography.sass index ae65038b..cddaa64a 100644 --- a/assets/sass/base/_typography.sass +++ b/assets/sass/base/_typography.sass @@ -1,3 +1,6 @@ @each $value in 'left' 'center' 'right' .text-#{$value} text-align: #{$value} + +.text-light + color: #777 diff --git a/assets/sass/experience.sass b/assets/sass/experience.sass index 99a7d764..6edc5bb5 100644 --- a/assets/sass/experience.sass +++ b/assets/sass/experience.sass @@ -7,11 +7,9 @@ +clearfix .experience-item-website - display: inline-block margin-bottom: 2px .experience-item-role - color: $gray-light margin-bottom: .625rem .experience-item-logo diff --git a/assets/sass/testimonials.sass b/assets/sass/testimonials.sass index 2e2da81f..4c8cb86d 100644 --- a/assets/sass/testimonials.sass +++ b/assets/sass/testimonials.sass @@ -6,9 +6,6 @@ +clearfix margin-bottom: 10px - &__role - color: #777 - &__image height: 75px margin: 0 0 10px 10px diff --git a/source/_includes/post/header.html.twig b/source/_includes/post/header.html.twig index d16d1c66..2bc25331 100644 --- a/source/_includes/post/header.html.twig +++ b/source/_includes/post/header.html.twig @@ -1,4 +1,4 @@ -{% set title_tag = title_tag|default('h1') %} +{% set title_tag = title_tag ?: 'h1' %} <{{ title_tag }}>{{ page.title }} -

{{ page.date|date('jS F Y') }}

+

{{ page.date|date('jS F Y') }}

diff --git a/source/experience.html.twig b/source/experience.html.twig index 98114f8e..a9afc2c3 100644 --- a/source/experience.html.twig +++ b/source/experience.html.twig @@ -23,12 +23,12 @@ redirect:

{{ company.name }}

{% if company.url -%} - + {{- company.url -}} {%- endif %} -
+
{{- experience.role }} from {{ experience.start }} diff --git a/source/testimonials.html.twig b/source/testimonials.html.twig index 3b975041..7e6e01ed 100644 --- a/source/testimonials.html.twig +++ b/source/testimonials.html.twig @@ -74,12 +74,16 @@ use: [posts]

{{ testimonial.name }}

{% if testimonial.image %} - {{ testimonial.name }} + {{ testimonial.name }} {% endif %} {% if testimonial.role %} -
- {{ testimonial.role|markdown}} +
+ {{ testimonial.role|markdown }}
{% endif %}