diff --git a/.gitignore b/.gitignore index 671b8f1f..7cd0777b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ /node_modules/ /output_*/ -/source/assets +/source/assets/css/ +/source/assets/fonts/ +/source/assets/js/ /.sculpin/ /vendor/ .sass-cache/ publish.sh -assets/images/*/* -!assets/images/*/originals diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index 316a1336..89dad736 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -1,7 +1,3 @@ -sculpin: - ignore: - - 'assets/images/*/originals/*' - sculpin_content_types: posts: permalink: blog/:slug_title/ diff --git a/assets/images/da-individual-member.png b/assets/images/da-individual-member.png deleted file mode 100644 index 02b65ca9..00000000 Binary files a/assets/images/da-individual-member.png and /dev/null differ diff --git a/assets/images/drupal-8.jpg b/assets/images/drupal-8.jpg deleted file mode 100644 index 308ca012..00000000 Binary files a/assets/images/drupal-8.jpg and /dev/null differ diff --git a/assets/images/drupal-association-become-member.png b/assets/images/drupal-association-become-member.png deleted file mode 100644 index ecde6d79..00000000 Binary files a/assets/images/drupal-association-become-member.png and /dev/null differ diff --git a/assets/images/drupalcon-barcelona.png b/assets/images/drupalcon-barcelona.png deleted file mode 100644 index 64552af9..00000000 Binary files a/assets/images/drupalcon-barcelona.png and /dev/null differ diff --git a/assets/images/drupalcon-la-attending.png b/assets/images/drupalcon-la-attending.png deleted file mode 100644 index 87ed669b..00000000 Binary files a/assets/images/drupalcon-la-attending.png and /dev/null differ diff --git a/assets/images/drupalcon-la-sprinter.png b/assets/images/drupalcon-la-sprinter.png deleted file mode 100644 index b0f1dd0a..00000000 Binary files a/assets/images/drupalcon-la-sprinter.png and /dev/null differ diff --git a/assets/images/me-precedent.jpg b/assets/images/me-precedent.jpg deleted file mode 100644 index 258e79f5..00000000 Binary files a/assets/images/me-precedent.jpg and /dev/null differ diff --git a/gulpfile.js b/gulpfile.js index 46a35257..280071d0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -66,19 +66,6 @@ gulp.task('fonts', function () { ); }); -gulp.task('meetup-thumbnails', function () { - gulp.src(config.assetsDir + '/images/meetups/originals/*') - .pipe(plugins.imageResize({ height: 80 })) - .pipe(gulp.dest(config.outputDir + '/images/meetups/thumbnails')) - .pipe(gulp.dest('output_dev/assets/images/meetups/thumbnails')); -}); - -gulp.task('copy-images', function () { - app.copy(config.assetsDir + '/images/**/*', config.outputDir + '/images'); -}); - -gulp.task('images', ['meetup-thumbnails', 'copy-images']); - gulp.task('clean', function () { del.sync(config.outputDir + '/css'); del.sync(config.outputDir + '/js'); @@ -86,7 +73,7 @@ gulp.task('clean', function () { del.sync('output_*/assets/js'); }); -gulp.task('build', ['clean', 'styles', 'scripts', 'fonts', 'images']); +gulp.task('build', ['clean', 'styles', 'scripts', 'fonts']); gulp.task('watch', function () { plugins.refresh.listen(); diff --git a/source/_includes/meetups.html.twig b/source/_includes/meetups.html.twig index e845e477..da31cbe6 100644 --- a/source/_includes/meetups.html.twig +++ b/source/_includes/meetups.html.twig @@ -4,7 +4,7 @@ {% for meetup in site.meetups %}
  • - {{ meetup.name }} + {{ meetup.name }}
  • {% endfor %} diff --git a/assets/images/blog/drupalvm-generate-example-2.gif b/source/assets/images/blog/drupalvm-generate-example-2.gif similarity index 100% rename from assets/images/blog/drupalvm-generate-example-2.gif rename to source/assets/images/blog/drupalvm-generate-example-2.gif diff --git a/assets/images/blog/drupalvm-generate-example.gif b/source/assets/images/blog/drupalvm-generate-example.gif similarity index 100% rename from assets/images/blog/drupalvm-generate-example.gif rename to source/assets/images/blog/drupalvm-generate-example.gif diff --git a/assets/images/blog/drupalvm-generate-release.png b/source/assets/images/blog/drupalvm-generate-release.png similarity index 100% rename from assets/images/blog/drupalvm-generate-release.png rename to source/assets/images/blog/drupalvm-generate-release.png diff --git a/assets/images/blog/drupalvm-generate-repo.png b/source/assets/images/blog/drupalvm-generate-repo.png similarity index 100% rename from assets/images/blog/drupalvm-generate-repo.png rename to source/assets/images/blog/drupalvm-generate-repo.png diff --git a/assets/images/blog/forked-github-repo-commits.png b/source/assets/images/blog/forked-github-repo-commits.png similarity index 100% rename from assets/images/blog/forked-github-repo-commits.png rename to source/assets/images/blog/forked-github-repo-commits.png diff --git a/assets/images/blog/git-format-patch.png b/source/assets/images/blog/git-format-patch.png similarity index 100% rename from assets/images/blog/git-format-patch.png rename to source/assets/images/blog/git-format-patch.png diff --git a/assets/images/blog/github-fork-rebase-phpstorm.png b/source/assets/images/blog/github-fork-rebase-phpstorm.png similarity index 100% rename from assets/images/blog/github-fork-rebase-phpstorm.png rename to source/assets/images/blog/github-fork-rebase-phpstorm.png diff --git a/assets/images/blog/minimum-drupal-version-d7.png b/source/assets/images/blog/minimum-drupal-version-d7.png similarity index 100% rename from assets/images/blog/minimum-drupal-version-d7.png rename to source/assets/images/blog/minimum-drupal-version-d7.png diff --git a/assets/images/blog/my-commit-to-the-rebased-branch.png b/source/assets/images/blog/my-commit-to-the-rebased-branch.png similarity index 100% rename from assets/images/blog/my-commit-to-the-rebased-branch.png rename to source/assets/images/blog/my-commit-to-the-rebased-branch.png diff --git a/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png b/source/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png similarity index 100% rename from assets/images/blog/oliverdavies-uk-jenkins-git-poll.png rename to source/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png diff --git a/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png b/source/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png similarity index 100% rename from assets/images/blog/oliverdavies-uk-jenkins-git-repo.png rename to source/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png diff --git a/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png b/source/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png similarity index 100% rename from assets/images/blog/oliverdavies-uk-jenkins-git-timer.png rename to source/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png diff --git a/assets/images/blog/oliverdavies-uk-jenkins-shell.png b/source/assets/images/blog/oliverdavies-uk-jenkins-shell.png similarity index 100% rename from assets/images/blog/oliverdavies-uk-jenkins-shell.png rename to source/assets/images/blog/oliverdavies-uk-jenkins-shell.png diff --git a/source/assets/images/experience/appnovation.png b/source/assets/images/experience/appnovation.png new file mode 100644 index 00000000..4fb0594d Binary files /dev/null and b/source/assets/images/experience/appnovation.png differ diff --git a/assets/images/experience/cti-digital.png b/source/assets/images/experience/cti-digital.png similarity index 100% rename from assets/images/experience/cti-digital.png rename to source/assets/images/experience/cti-digital.png diff --git a/assets/images/experience/drupal-association.png b/source/assets/images/experience/drupal-association.png similarity index 100% rename from assets/images/experience/drupal-association.png rename to source/assets/images/experience/drupal-association.png diff --git a/assets/images/experience/horse-and-country.jpg b/source/assets/images/experience/horse-and-country.jpg similarity index 100% rename from assets/images/experience/horse-and-country.jpg rename to source/assets/images/experience/horse-and-country.jpg diff --git a/assets/images/experience/lab-class.png b/source/assets/images/experience/lab-class.png similarity index 100% rename from assets/images/experience/lab-class.png rename to source/assets/images/experience/lab-class.png diff --git a/assets/images/experience/microserve.png b/source/assets/images/experience/microserve.png similarity index 100% rename from assets/images/experience/microserve.png rename to source/assets/images/experience/microserve.png diff --git a/assets/images/experience/nomensa.png b/source/assets/images/experience/nomensa.png similarity index 100% rename from assets/images/experience/nomensa.png rename to source/assets/images/experience/nomensa.png diff --git a/assets/images/experience/precedent.jpg b/source/assets/images/experience/precedent.jpg similarity index 100% rename from assets/images/experience/precedent.jpg rename to source/assets/images/experience/precedent.jpg diff --git a/assets/images/experience/proctors.jpg b/source/assets/images/experience/proctors.jpg similarity index 100% rename from assets/images/experience/proctors.jpg rename to source/assets/images/experience/proctors.jpg diff --git a/assets/images/meetups/originals/accessible-bristol.png b/source/assets/images/meetups/accessible-bristol.png similarity index 100% rename from assets/images/meetups/originals/accessible-bristol.png rename to source/assets/images/meetups/accessible-bristol.png diff --git a/assets/images/meetups/originals/drupal-bristol.jpeg b/source/assets/images/meetups/drupal-bristol.jpeg similarity index 100% rename from assets/images/meetups/originals/drupal-bristol.jpeg rename to source/assets/images/meetups/drupal-bristol.jpeg diff --git a/assets/images/meetups/originals/drupalcamp-bristol.png b/source/assets/images/meetups/drupalcamp-bristol.png similarity index 100% rename from assets/images/meetups/originals/drupalcamp-bristol.png rename to source/assets/images/meetups/drupalcamp-bristol.png diff --git a/assets/images/meetups/originals/nwdug.jpg b/source/assets/images/meetups/nwdug.jpg similarity index 100% rename from assets/images/meetups/originals/nwdug.jpg rename to source/assets/images/meetups/nwdug.jpg diff --git a/assets/images/meetups/originals/phpnw.gif b/source/assets/images/meetups/phpnw.gif similarity index 100% rename from assets/images/meetups/originals/phpnw.gif rename to source/assets/images/meetups/phpnw.gif diff --git a/assets/images/meetups/originals/phpnw.jpg b/source/assets/images/meetups/phpnw.jpg similarity index 100% rename from assets/images/meetups/originals/phpnw.jpg rename to source/assets/images/meetups/phpnw.jpg diff --git a/assets/images/meetups/originals/phpsw.jpeg b/source/assets/images/meetups/phpsw.jpeg similarity index 100% rename from assets/images/meetups/originals/phpsw.jpeg rename to source/assets/images/meetups/phpsw.jpeg diff --git a/assets/images/meetups/originals/swdug.png b/source/assets/images/meetups/swdug.png similarity index 100% rename from assets/images/meetups/originals/swdug.png rename to source/assets/images/meetups/swdug.png diff --git a/assets/images/meetups/originals/swlug.png b/source/assets/images/meetups/swlug.png similarity index 100% rename from assets/images/meetups/originals/swlug.png rename to source/assets/images/meetups/swlug.png diff --git a/assets/images/meetups/originals/unified-diff.png b/source/assets/images/meetups/unified-diff.png similarity index 100% rename from assets/images/meetups/originals/unified-diff.png rename to source/assets/images/meetups/unified-diff.png diff --git a/assets/images/projects/accessible-bristol.png b/source/assets/images/projects/accessible-bristol.png similarity index 100% rename from assets/images/projects/accessible-bristol.png rename to source/assets/images/projects/accessible-bristol.png diff --git a/assets/images/projects/aspira.png b/source/assets/images/projects/aspira.png similarity index 100% rename from assets/images/projects/aspira.png rename to source/assets/images/projects/aspira.png diff --git a/assets/images/projects/avon-motorsport.png b/source/assets/images/projects/avon-motorsport.png similarity index 100% rename from assets/images/projects/avon-motorsport.png rename to source/assets/images/projects/avon-motorsport.png diff --git a/assets/images/projects/cattery.png b/source/assets/images/projects/cattery.png similarity index 100% rename from assets/images/projects/cattery.png rename to source/assets/images/projects/cattery.png diff --git a/assets/images/projects/daylight-photo-awards.png b/source/assets/images/projects/daylight-photo-awards.png similarity index 100% rename from assets/images/projects/daylight-photo-awards.png rename to source/assets/images/projects/daylight-photo-awards.png diff --git a/assets/images/projects/digital-theatre-plus.png b/source/assets/images/projects/digital-theatre-plus.png similarity index 100% rename from assets/images/projects/digital-theatre-plus.png rename to source/assets/images/projects/digital-theatre-plus.png diff --git a/assets/images/projects/door-decor-more.png b/source/assets/images/projects/door-decor-more.png similarity index 100% rename from assets/images/projects/door-decor-more.png rename to source/assets/images/projects/door-decor-more.png diff --git a/assets/images/projects/drupalorg.png b/source/assets/images/projects/drupalorg.png similarity index 100% rename from assets/images/projects/drupalorg.png rename to source/assets/images/projects/drupalorg.png diff --git a/assets/images/projects/drupalvmgenerator.com.png b/source/assets/images/projects/drupalvmgenerator.com.png similarity index 100% rename from assets/images/projects/drupalvmgenerator.com.png rename to source/assets/images/projects/drupalvmgenerator.com.png diff --git a/assets/images/projects/handc.png b/source/assets/images/projects/handc.png similarity index 100% rename from assets/images/projects/handc.png rename to source/assets/images/projects/handc.png diff --git a/assets/images/projects/hutch-paving.png b/source/assets/images/projects/hutch-paving.png similarity index 100% rename from assets/images/projects/hutch-paving.png rename to source/assets/images/projects/hutch-paving.png diff --git a/assets/images/projects/ifoa.png b/source/assets/images/projects/ifoa.png similarity index 100% rename from assets/images/projects/ifoa.png rename to source/assets/images/projects/ifoa.png diff --git a/assets/images/projects/mfvc.png b/source/assets/images/projects/mfvc.png similarity index 100% rename from assets/images/projects/mfvc.png rename to source/assets/images/projects/mfvc.png diff --git a/assets/images/projects/rathbone-greenbank.png b/source/assets/images/projects/rathbone-greenbank.png similarity index 100% rename from assets/images/projects/rathbone-greenbank.png rename to source/assets/images/projects/rathbone-greenbank.png diff --git a/assets/images/projects/roadcc.png b/source/assets/images/projects/roadcc.png similarity index 100% rename from assets/images/projects/roadcc.png rename to source/assets/images/projects/roadcc.png diff --git a/assets/images/projects/source-for-searches.png b/source/assets/images/projects/source-for-searches.png similarity index 100% rename from assets/images/projects/source-for-searches.png rename to source/assets/images/projects/source-for-searches.png diff --git a/assets/images/projects/vikisports.png b/source/assets/images/projects/vikisports.png similarity index 100% rename from assets/images/projects/vikisports.png rename to source/assets/images/projects/vikisports.png diff --git a/assets/images/projects/wattstvc.png b/source/assets/images/projects/wattstvc.png similarity index 100% rename from assets/images/projects/wattstvc.png rename to source/assets/images/projects/wattstvc.png diff --git a/assets/images/projects/wlsquared.png b/source/assets/images/projects/wlsquared.png similarity index 100% rename from assets/images/projects/wlsquared.png rename to source/assets/images/projects/wlsquared.png diff --git a/assets/images/skills/originals/compass.png b/source/assets/images/skills/originals/compass.png similarity index 100% rename from assets/images/skills/originals/compass.png rename to source/assets/images/skills/originals/compass.png diff --git a/assets/images/skills/originals/composer.png b/source/assets/images/skills/originals/composer.png similarity index 100% rename from assets/images/skills/originals/composer.png rename to source/assets/images/skills/originals/composer.png diff --git a/assets/images/skills/originals/drupal-commerce.png b/source/assets/images/skills/originals/drupal-commerce.png similarity index 100% rename from assets/images/skills/originals/drupal-commerce.png rename to source/assets/images/skills/originals/drupal-commerce.png diff --git a/assets/images/skills/originals/drupal.png b/source/assets/images/skills/originals/drupal.png similarity index 100% rename from assets/images/skills/originals/drupal.png rename to source/assets/images/skills/originals/drupal.png diff --git a/assets/images/skills/originals/druplicon.png b/source/assets/images/skills/originals/druplicon.png similarity index 100% rename from assets/images/skills/originals/druplicon.png rename to source/assets/images/skills/originals/druplicon.png diff --git a/assets/images/skills/originals/git.png b/source/assets/images/skills/originals/git.png similarity index 100% rename from assets/images/skills/originals/git.png rename to source/assets/images/skills/originals/git.png diff --git a/assets/images/skills/originals/jenkins.png b/source/assets/images/skills/originals/jenkins.png similarity index 100% rename from assets/images/skills/originals/jenkins.png rename to source/assets/images/skills/originals/jenkins.png diff --git a/assets/images/skills/originals/less.png b/source/assets/images/skills/originals/less.png similarity index 100% rename from assets/images/skills/originals/less.png rename to source/assets/images/skills/originals/less.png diff --git a/assets/images/skills/originals/php.png b/source/assets/images/skills/originals/php.png similarity index 100% rename from assets/images/skills/originals/php.png rename to source/assets/images/skills/originals/php.png diff --git a/assets/images/skills/originals/sass.png b/source/assets/images/skills/originals/sass.png similarity index 100% rename from assets/images/skills/originals/sass.png rename to source/assets/images/skills/originals/sass.png diff --git a/assets/images/skills/originals/svn.jpg b/source/assets/images/skills/originals/svn.jpg similarity index 100% rename from assets/images/skills/originals/svn.jpg rename to source/assets/images/skills/originals/svn.jpg diff --git a/assets/images/skills/originals/symfony.png b/source/assets/images/skills/originals/symfony.png similarity index 100% rename from assets/images/skills/originals/symfony.png rename to source/assets/images/skills/originals/symfony.png diff --git a/assets/images/talks/dclondon16.png b/source/assets/images/talks/dclondon16.png similarity index 100% rename from assets/images/talks/dclondon16.png rename to source/assets/images/talks/dclondon16.png diff --git a/assets/images/testimonials/brian-healy.png b/source/assets/images/testimonials/brian-healy.png similarity index 100% rename from assets/images/testimonials/brian-healy.png rename to source/assets/images/testimonials/brian-healy.png diff --git a/assets/images/testimonials/chris-jarvis.jpg b/source/assets/images/testimonials/chris-jarvis.jpg similarity index 100% rename from assets/images/testimonials/chris-jarvis.jpg rename to source/assets/images/testimonials/chris-jarvis.jpg diff --git a/assets/images/testimonials/ed-welsby.png b/source/assets/images/testimonials/ed-welsby.png similarity index 100% rename from assets/images/testimonials/ed-welsby.png rename to source/assets/images/testimonials/ed-welsby.png diff --git a/assets/images/testimonials/holly-ross.png b/source/assets/images/testimonials/holly-ross.png similarity index 100% rename from assets/images/testimonials/holly-ross.png rename to source/assets/images/testimonials/holly-ross.png diff --git a/assets/images/testimonials/james-chapman.png b/source/assets/images/testimonials/james-chapman.png similarity index 100% rename from assets/images/testimonials/james-chapman.png rename to source/assets/images/testimonials/james-chapman.png diff --git a/assets/images/testimonials/josh-mitchell.png b/source/assets/images/testimonials/josh-mitchell.png similarity index 100% rename from assets/images/testimonials/josh-mitchell.png rename to source/assets/images/testimonials/josh-mitchell.png diff --git a/assets/images/testimonials/leonie-watson.jpg b/source/assets/images/testimonials/leonie-watson.jpg similarity index 100% rename from assets/images/testimonials/leonie-watson.jpg rename to source/assets/images/testimonials/leonie-watson.jpg