From c873cf232182bfde5cb9bda502783015ee3d864f Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 19 Feb 2017 21:14:22 +0000 Subject: [PATCH] Update talk page layout --- assets/sass/base/_all.sass | 2 ++ assets/sass/base/_layout.sass | 5 ++++ assets/sass/base/_typography.sass | 3 +++ assets/sass/pages/_all.sass | 1 + assets/sass/pages/_talk.sass | 7 +++++ source/_partials/talk/event.twig | 14 ---------- source/_partials/talk/location.twig | 3 +++ source/_partials/talk/slides.twig | 8 ++---- source/_partials/talk/video.twig | 8 +++--- source/_partials/talks-table.twig | 2 +- ...-what-is-this-drupal-thing-unified-diff.md | 7 ++--- source/_talks/2013-07-10-drupal-ldap-swdug.md | 4 +-- ...4-03-01-git-flow-drupalcamp-london-2014.md | 6 ++--- ...drush-make-drupalbristol-drupal-bristol.md | 6 ++--- .../2014-08-19-drupal-association-swdug.md | 4 +-- ...drupalorg-2015-drupalcamp-brighton-2015.md | 6 ++--- ...8-drupalorg-2015-drupalcamp-london-2015.md | 6 ++--- source/_talks/2015-04-08-drupal-8-phpsw.md | 5 +--- ...twig-with-sculpin-drupalcamp-north-2015.md | 5 +--- ...2015-08-25-dancing-for-drupal-umbristol.md | 5 +--- source/_talks/2015-10-14-sculpin-phpsw.md | 5 +--- ...dule-development-drupalcamp-london-2016.md | 5 +--- .../2016-03-09-drupal-vm-generator-nwdug.md | 5 +--- ...4-02-drupal-vm-generator-drupal-bristol.md | 5 +--- ...rejoining-the-herd-php-south-coast-2016.md | 5 +--- ...symfony-console-drupalcamp-bristol-2016.md | 7 ++--- ...-drupal-development-with-composer-phpsw.md | 5 +--- ...rush-make-hello-composer-drupal-bristol.md | 7 ++--- ...-your-data-into-drupal-8-drupal-bristol.md | 5 +--- ...02-08-it-all-started-with-a-patch-phpsw.md | 5 +--- ...-16-deploying-php-with-fabric-nomad-php.md | 5 +--- ...ta-into-drupal-8-drupalcamp-london-2017.md | 5 +--- ...mpletest-phpunit-drupalcamp-london-2017.md | 5 +--- source/_views/talk.twig | 27 ++++++++++++++++--- 34 files changed, 82 insertions(+), 121 deletions(-) create mode 100644 assets/sass/base/_layout.sass create mode 100644 assets/sass/base/_typography.sass create mode 100644 assets/sass/pages/_talk.sass delete mode 100644 source/_partials/talk/event.twig create mode 100644 source/_partials/talk/location.twig diff --git a/assets/sass/base/_all.sass b/assets/sass/base/_all.sass index 64fd818d..2ba3f4c8 100644 --- a/assets/sass/base/_all.sass +++ b/assets/sass/base/_all.sass @@ -1 +1,3 @@ @import 'code' +@import 'layout' +@import 'typography' diff --git a/assets/sass/base/_layout.sass b/assets/sass/base/_layout.sass new file mode 100644 index 00000000..261f1c43 --- /dev/null +++ b/assets/sass/base/_layout.sass @@ -0,0 +1,5 @@ +.is-flex + display: flex + +.is-half + width: 50% diff --git a/assets/sass/base/_typography.sass b/assets/sass/base/_typography.sass new file mode 100644 index 00000000..359ea095 --- /dev/null +++ b/assets/sass/base/_typography.sass @@ -0,0 +1,3 @@ +@each $value in 'left' 'center' 'right' + .is-#{$value} + text-align: #{$value} diff --git a/assets/sass/pages/_all.sass b/assets/sass/pages/_all.sass index 8ee4522b..1c706c3e 100644 --- a/assets/sass/pages/_all.sass +++ b/assets/sass/pages/_all.sass @@ -3,3 +3,4 @@ @import 'blog-post' @import 'experience' @import 'projects' +@import 'talk' diff --git a/assets/sass/pages/_talk.sass b/assets/sass/pages/_talk.sass new file mode 100644 index 00000000..bbf57ca5 --- /dev/null +++ b/assets/sass/pages/_talk.sass @@ -0,0 +1,7 @@ +.talk-location, +.talk-slides, +.talk-video + margin-bottom: 1.5em + +.talk-pager + margin-top: 2em diff --git a/source/_partials/talk/event.twig b/source/_partials/talk/event.twig deleted file mode 100644 index 81440aae..00000000 --- a/source/_partials/talk/event.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% if page.event %} -

Details

- - -{% endif %} diff --git a/source/_partials/talk/location.twig b/source/_partials/talk/location.twig new file mode 100644 index 00000000..d6b651eb --- /dev/null +++ b/source/_partials/talk/location.twig @@ -0,0 +1,3 @@ +

+ At {{ page.location }} on {{ page.date|date('jS F Y') }}. +

diff --git a/source/_partials/talk/slides.twig b/source/_partials/talk/slides.twig index 9a2271f4..69f43f94 100644 --- a/source/_partials/talk/slides.twig +++ b/source/_partials/talk/slides.twig @@ -1,9 +1,5 @@ {% if page.slides.embed %} -
-

Slides

- -
- {{ page.slides.embed|raw }} -
+
+ {{ page.slides.embed|raw }}
{% endif %} diff --git a/source/_partials/talk/video.twig b/source/_partials/talk/video.twig index 96a9dd87..2f4e8961 100644 --- a/source/_partials/talk/video.twig +++ b/source/_partials/talk/video.twig @@ -1,7 +1,7 @@ {% if page.video.embed %} -

Video

- -
- {{ page.video.embed|raw }} +
+
+ {{ page.video.embed|raw }} +
{% endif %} diff --git a/source/_partials/talks-table.twig b/source/_partials/talks-table.twig index e9ecabc7..538025f0 100644 --- a/source/_partials/talks-table.twig +++ b/source/_partials/talks-table.twig @@ -19,7 +19,7 @@ - {{ talk.event.name }} + {{ talk.location }} {% endfor %} diff --git a/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md b/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md index bae9c8aa..e3eddae5 100644 --- a/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md +++ b/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md @@ -1,13 +1,10 @@ --- title: So, what is this Drupal thing? -event: - name: Unified Diff - website: http://unifieddiff.co.uk - location: Cardiff, UK +location: Unified Diff +logo_link: http://unifieddiff.co.uk video: embed: url: https://vimeo.com/49827006 -slug: what-is-this-drupal-thing tags: - meetup - drupal diff --git a/source/_talks/2013-07-10-drupal-ldap-swdug.md b/source/_talks/2013-07-10-drupal-ldap-swdug.md index 7b62a881..f89361ac 100644 --- a/source/_talks/2013-07-10-drupal-ldap-swdug.md +++ b/source/_talks/2013-07-10-drupal-ldap-swdug.md @@ -1,8 +1,6 @@ --- title: Drupal and the LDAP Module -event: - name: SWDUG (South Wales Drupal user group) - location: Cardiff, UK +location: SWDUG tags: - meetup - swdug diff --git a/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md b/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md index 4b202bba..38f9e277 100644 --- a/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md +++ b/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md @@ -1,9 +1,7 @@ --- title: Never Commit to Master - An Introduction to Git Flow -event: - name: DrupalCamp London 2014 - website: http://2014.drupalcamplondon.co.uk - location: London, UK +location: DrupalCamp London 2014 +logo_link: http://2014.drupalcamplondon.co.uk slides: embed: url: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md index aa0bfdd6..dfae553f 100644 --- a/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md +++ b/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md @@ -1,9 +1,7 @@ --- title: drush make drupalbristol -event: - name: Bristol Drupal - website: http://www.drupalbristol.org.uk - location: Bristol, UK +location: Bristol Drupal +logo_link: http://www.drupalbristol.org.uk slides: embed: url: https://speakerdeck.com/opdavies/drush-make-drupalbristol diff --git a/source/_talks/2014-08-19-drupal-association-swdug.md b/source/_talks/2014-08-19-drupal-association-swdug.md index 3fbfafec..e7c31e7b 100644 --- a/source/_talks/2014-08-19-drupal-association-swdug.md +++ b/source/_talks/2014-08-19-drupal-association-swdug.md @@ -1,8 +1,6 @@ --- title: About the Drupal Association -event: - name: SWDUG - location: Cardiff, UK +location: SWDUG tags: - meetup - swdug diff --git a/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md b/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md index e00aef91..fb1ea39e 100644 --- a/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md +++ b/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md @@ -1,9 +1,7 @@ --- title: Drupal.org in 2015: What's Coming Next -event: - name: DrupalCamp Brighton 2015 - website: http://www.drupalcampbrighton.co.uk/drupalcamp-brighton-2015 - location: Brighton, UK +location: DrupalCamp Brighton 2015 +logo_link: http://www.drupalcampbrighton.co.uk/drupalcamp-brighton-2015 tags: - conference - drupalcamp diff --git a/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md b/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md index fd4d25ba..f4fd996e 100644 --- a/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md +++ b/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md @@ -1,9 +1,7 @@ --- title: Drupal.org in 2015: What's Coming Next -event: - name: DrupalCamp London 2015 - website: http://2015.drupalcamplondon.co.uk - location: London, UK +location: DrupalCamp London 2015 +logo_link: http://2015.drupalcamplondon.co.uk tags: - conference - drupalcamp diff --git a/source/_talks/2015-04-08-drupal-8-phpsw.md b/source/_talks/2015-04-08-drupal-8-phpsw.md index 251a1af3..e7446845 100644 --- a/source/_talks/2015-04-08-drupal-8-phpsw.md +++ b/source/_talks/2015-04-08-drupal-8-phpsw.md @@ -1,9 +1,6 @@ --- title: Drupal 8 -event: - name: PHPSW - website: http://phpsw.uk - location: Bristol, UK +location: PHPSW slides: embed: url: https://speakerdeck.com/opdavies/drupal-8 diff --git a/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md b/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md index 8509640e..bd463e97 100644 --- a/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md +++ b/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md @@ -1,9 +1,6 @@ --- title: Test Drive Twig with Sculpin -event: - name: DrupalCamp North 2015 - website: http://drupalcampnorth.org - location: Sunderland, UK +location: DrupalCamp North 2015 slides: embed: url: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin diff --git a/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md b/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md index c91edc90..ee7ad896 100644 --- a/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md +++ b/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md @@ -1,9 +1,6 @@ --- title: Dancing for Drupal -event: - name: umBristol (Bristol Umbraco user group) - website: http://umbristol.co.uk - location: Bristol, UK +location: umBristol (Bristol Umbraco user group) slides: embed: url: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal diff --git a/source/_talks/2015-10-14-sculpin-phpsw.md b/source/_talks/2015-10-14-sculpin-phpsw.md index bceb43ca..98c64f88 100644 --- a/source/_talks/2015-10-14-sculpin-phpsw.md +++ b/source/_talks/2015-10-14-sculpin-phpsw.md @@ -1,9 +1,6 @@ --- title: Building Static Websites with Sculpin -event: - name: PHPSW - website: http://phpsw.uk - location: Bristol, UK +location: PHPSW slides: embed: url: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin diff --git a/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md b/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md index eaa78ea0..62482ed3 100644 --- a/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md +++ b/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md @@ -1,9 +1,6 @@ --- title: Getting Started with Drupal 8 Module Development -event: - name: DrupalCamp London 2016 - website: http://drupalcamp.london - location: London, UK +location: DrupalCamp London 2016 tags: - conference - php diff --git a/source/_talks/2016-03-09-drupal-vm-generator-nwdug.md b/source/_talks/2016-03-09-drupal-vm-generator-nwdug.md index 22739e33..2ec5ada4 100644 --- a/source/_talks/2016-03-09-drupal-vm-generator-nwdug.md +++ b/source/_talks/2016-03-09-drupal-vm-generator-nwdug.md @@ -1,9 +1,6 @@ --- title: Drupal VM Generator -event: - name: NWDUG - website: http://nwdrupal.org.uk - location: Manchester, UK +location: NWDUG code: https://github.com/opdavies/drupal-vm-generator tags: - drupal-vm diff --git a/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md b/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md index 0f89f8a6..cdb8cdd8 100644 --- a/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md +++ b/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md @@ -1,9 +1,6 @@ --- title: Drupal VM Generator -event: - name: Drupal Bristol - website: https://www.drupalbristol.org.uk - location: Bristol, UK +location: Drupal Bristol code: https://github.com/opdavies/drupal-vm-generator tags: - drupal-vm diff --git a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md b/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md index ae6b731a..43af2940 100644 --- a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md +++ b/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md @@ -1,9 +1,6 @@ --- title: Drupal 8: Rejoining the Herd -event: - name: PHP South Coast 2016 - website: http://2016.phpsouthcoast.co.uk - location: Portsmouth, UK +location: PHP South Coast 2016 tags: - conference - php diff --git a/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md b/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md index 46272810..8a0394bf 100644 --- a/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md +++ b/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md @@ -1,10 +1,7 @@ --- title: Drupal VM, Meet Symfony Console -event: - name: DrupalCamp Bristol 2016 - website: https://www.drupalcampbristol.co.uk - location: Bristol, UK - logo: assets/images/talks/drupalcamp-bristol.png +location: DrupalCamp Bristol 2016 +logo: assets/images/talks/drupalcamp-bristol.png tags: - conference - php diff --git a/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md b/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md index 8adef470..ddc048ad 100644 --- a/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md +++ b/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md @@ -1,10 +1,7 @@ --- title: Modern Drupal Development with Composer type: Lightning talk -event: - name: PHPSW - website: http://phpsw.uk - location: Bristol, UK +location: PHPSW tags: ['meetups', 'phpsw', 'drupal', 'composer'] slides: embed: '' diff --git a/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md b/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md index b911fe9b..7cf045b1 100644 --- a/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md +++ b/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md @@ -1,10 +1,7 @@ --- title: Goodbye Drush Make. Hello Composer! -event: - name: Drupal Bristol - website: https://www.drupalbristol.org.uk - location: Bristol, UK - logo: assets/images/talks/drupalcamp-bristol.png +location: Drupal Bristol +logo: assets/images/talks/drupalcamp-bristol.png tags: ['meetup', 'drupal', 'composer'] # image: drush-make-is-dead-long-live-composer.png slides: diff --git a/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md b/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md index d98eace9..907d1139 100644 --- a/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md +++ b/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md @@ -1,9 +1,6 @@ --- title: Getting (Your Data) Into Drupal 8 -event: - name: Drupal Bristol - website: https://www.drupalbristol.org.uk - location: Bristol, UK +location: Drupal Bristol tags: ['meetup', 'drupal', 'drupal-8'] slides: url: ~ diff --git a/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md b/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md index 4d848b7e..8cac7d91 100644 --- a/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md +++ b/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md @@ -1,9 +1,6 @@ --- title: It All Started With A Patch -event: - name: PHPSW - website: https://phpsw.uk - location: Bristol, UK +location: PHPSW tags: [meetup, phpsw, open-source] slides: url: https://speakerdeck.com/opdavies/it-all-started-with-a-patch-phpsw diff --git a/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md b/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md index 1a2d3864..7249e149 100644 --- a/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md +++ b/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md @@ -1,9 +1,6 @@ --- title: Deploying PHP Applications with Fabric -event: - name: Nomad PHP Lightning Talks - website: https://nomadphp.com - location: Online +location: Nomad PHP tags: ['meetup', 'php', 'fabric'] slides: url: ~ diff --git a/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md b/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md index 45b1e68b..913bc9d4 100644 --- a/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md +++ b/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md @@ -1,9 +1,6 @@ --- title: Getting (Your Data) Into Drupal 8 -event: - name: DrupalCamp London 2017 - website: http://drupalcamp.london - location: London, UK +location: DrupalCamp London 2017 tags: [] slides: url: ~ diff --git a/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md b/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md index d42555f8..5c83d6c8 100644 --- a/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md +++ b/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md @@ -1,10 +1,7 @@ --- title: Test driven Drupal development with SimpleTest and PHPUnit -event: - name: DrupalCamp London 2017 - website: http://drupalcamp.london - location: London, UK +location: DrupalCamp London 2017 tags: [] slides: url: ~ diff --git a/source/_views/talk.twig b/source/_views/talk.twig index fbaa11d9..51424f7f 100644 --- a/source/_views/talk.twig +++ b/source/_views/talk.twig @@ -5,9 +5,30 @@ {% endblock %} {% block content_wrapper %} - {% block content %}{% endblock %} - - {% include 'talk/event' %} + {% include 'talk/location' %} {% include 'talk/slides' %} {% include 'talk/video' %} + +
+ {% block content %}{% endblock %} +
+ +
+ {% if page.next_talk %} +
+ + « {{ page.next_talk.title }} + +
+ {% endif %} + + {% if page.previous_talk %} +
+ + {{ page.previous_talk.title }} » + +
+ {% endif %} +
+ {% endblock %}