diff --git a/.gitignore b/.gitignore index 26f0a342..9f5370d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ /node_modules/ /output_*/ -/source/build/ +/source/assets/ /vendor/ +mix-manifest.json +mix.js.map diff --git a/Makefile b/Makefile index e1859bd5..267d20d3 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,7 @@ clean: rm -rf \ node_modules \ output_* \ - source/assets/css \ - source/assets/fonts \ + source/assets \ vendor init: diff --git a/ansible/deploy/after-symlink-shared.yml b/ansible/deploy/after-symlink-shared.yml index f85aaec1..787f79c3 100644 --- a/ansible/deploy/after-symlink-shared.yml +++ b/ansible/deploy/after-symlink-shared.yml @@ -15,7 +15,7 @@ chdir: "{{ ansistrano_release_path.stdout }}" - name: Install Webpack Encore assets - command: './node_modules/.bin/encore production' + command: yarn run production args: chdir: "{{ ansistrano_release_path.stdout }}" diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index d8926e45..2c90218b 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -1,3 +1,5 @@ +sculpin: + ignore: ['**/.DS*', '**/*.swp'] sculpin_content_types: posts: permalink: blog/:year/:month/:day/:slug_title/ diff --git a/source/assets/images/badges/acquia-d8-back-end.png b/assets/images/badges/acquia-d8-back-end.png similarity index 100% rename from source/assets/images/badges/acquia-d8-back-end.png rename to assets/images/badges/acquia-d8-back-end.png diff --git a/source/assets/images/badges/acquia-d8-developer.png b/assets/images/badges/acquia-d8-developer.png similarity index 100% rename from source/assets/images/badges/acquia-d8-developer.png rename to assets/images/badges/acquia-d8-developer.png diff --git a/source/assets/images/badges/acquia-d8-front-end.png b/assets/images/badges/acquia-d8-front-end.png similarity index 100% rename from source/assets/images/badges/acquia-d8-front-end.png rename to assets/images/badges/acquia-d8-front-end.png diff --git a/source/assets/images/badges/acquia-d8-grand-master.png b/assets/images/badges/acquia-d8-grand-master.png similarity index 100% rename from source/assets/images/badges/acquia-d8-grand-master.png rename to assets/images/badges/acquia-d8-grand-master.png diff --git a/source/assets/images/badges/da-individual-member.png b/assets/images/badges/da-individual-member.png similarity index 100% rename from source/assets/images/badges/da-individual-member.png rename to assets/images/badges/da-individual-member.png diff --git a/source/assets/images/badges/drupal-8.jpg b/assets/images/badges/drupal-8.jpg similarity index 100% rename from source/assets/images/badges/drupal-8.jpg rename to assets/images/badges/drupal-8.jpg diff --git a/source/assets/images/badges/phpnw17.png b/assets/images/badges/phpnw17.png similarity index 100% rename from source/assets/images/badges/phpnw17.png rename to assets/images/badges/phpnw17.png diff --git a/source/assets/images/blog/custom-module-as-a-feature.png b/assets/images/blog/custom-module-as-a-feature.png similarity index 100% rename from source/assets/images/blog/custom-module-as-a-feature.png rename to assets/images/blog/custom-module-as-a-feature.png diff --git a/source/assets/images/blog/drupal-meetups-twitterbot.png b/assets/images/blog/drupal-meetups-twitterbot.png similarity index 100% rename from source/assets/images/blog/drupal-meetups-twitterbot.png rename to assets/images/blog/drupal-meetups-twitterbot.png diff --git a/source/assets/images/blog/drupalcamp-bristol-17-logo.jpg b/assets/images/blog/drupalcamp-bristol-17-logo.jpg similarity index 100% rename from source/assets/images/blog/drupalcamp-bristol-17-logo.jpg rename to assets/images/blog/drupalcamp-bristol-17-logo.jpg diff --git a/source/assets/images/blog/drupalcamp-dublin.jpg b/assets/images/blog/drupalcamp-dublin.jpg similarity index 100% rename from source/assets/images/blog/drupalcamp-dublin.jpg rename to assets/images/blog/drupalcamp-dublin.jpg diff --git a/source/assets/images/blog/drupalvm-generate-example-2.gif b/assets/images/blog/drupalvm-generate-example-2.gif similarity index 100% rename from source/assets/images/blog/drupalvm-generate-example-2.gif rename to assets/images/blog/drupalvm-generate-example-2.gif diff --git a/source/assets/images/blog/drupalvm-generate-example.gif b/assets/images/blog/drupalvm-generate-example.gif similarity index 100% rename from source/assets/images/blog/drupalvm-generate-example.gif rename to assets/images/blog/drupalvm-generate-example.gif diff --git a/source/assets/images/blog/drupalvm-generate-release.png b/assets/images/blog/drupalvm-generate-release.png similarity index 100% rename from source/assets/images/blog/drupalvm-generate-release.png rename to assets/images/blog/drupalvm-generate-release.png diff --git a/source/assets/images/blog/drupalvm-generate-repo.png b/assets/images/blog/drupalvm-generate-repo.png similarity index 100% rename from source/assets/images/blog/drupalvm-generate-repo.png rename to assets/images/blog/drupalvm-generate-repo.png diff --git a/source/assets/images/blog/forked-github-repo-commits.png b/assets/images/blog/forked-github-repo-commits.png similarity index 100% rename from source/assets/images/blog/forked-github-repo-commits.png rename to assets/images/blog/forked-github-repo-commits.png diff --git a/source/assets/images/blog/git-format-patch.png b/assets/images/blog/git-format-patch.png similarity index 100% rename from source/assets/images/blog/git-format-patch.png rename to assets/images/blog/git-format-patch.png diff --git a/source/assets/images/blog/github-fork-rebase-phpstorm.png b/assets/images/blog/github-fork-rebase-phpstorm.png similarity index 100% rename from source/assets/images/blog/github-fork-rebase-phpstorm.png rename to assets/images/blog/github-fork-rebase-phpstorm.png diff --git a/source/assets/images/blog/github-pages.png b/assets/images/blog/github-pages.png similarity index 100% rename from source/assets/images/blog/github-pages.png rename to assets/images/blog/github-pages.png diff --git a/source/assets/images/blog/jackson-octocat.png b/assets/images/blog/jackson-octocat.png similarity index 100% rename from source/assets/images/blog/jackson-octocat.png rename to assets/images/blog/jackson-octocat.png diff --git a/source/assets/images/blog/minimum-drupal-version-d7.png b/assets/images/blog/minimum-drupal-version-d7.png similarity index 100% rename from source/assets/images/blog/minimum-drupal-version-d7.png rename to assets/images/blog/minimum-drupal-version-d7.png diff --git a/source/assets/images/blog/my-commit-to-the-rebased-branch.png b/assets/images/blog/my-commit-to-the-rebased-branch.png similarity index 100% rename from source/assets/images/blog/my-commit-to-the-rebased-branch.png rename to assets/images/blog/my-commit-to-the-rebased-branch.png diff --git a/source/assets/images/blog/nginx-redirect-with-args.gif b/assets/images/blog/nginx-redirect-with-args.gif similarity index 100% rename from source/assets/images/blog/nginx-redirect-with-args.gif rename to assets/images/blog/nginx-redirect-with-args.gif diff --git a/source/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png b/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png similarity index 100% rename from source/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png rename to assets/images/blog/oliverdavies-uk-jenkins-git-poll.png diff --git a/source/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png b/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png similarity index 100% rename from source/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png rename to assets/images/blog/oliverdavies-uk-jenkins-git-repo.png diff --git a/source/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png b/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png similarity index 100% rename from source/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png rename to assets/images/blog/oliverdavies-uk-jenkins-git-timer.png diff --git a/source/assets/images/blog/oliverdavies-uk-jenkins-shell.png b/assets/images/blog/oliverdavies-uk-jenkins-shell.png similarity index 100% rename from source/assets/images/blog/oliverdavies-uk-jenkins-shell.png rename to assets/images/blog/oliverdavies-uk-jenkins-shell.png diff --git a/source/assets/images/blog/override-node-options-refactor-tests-new-passing.png b/assets/images/blog/override-node-options-refactor-tests-new-passing.png similarity index 100% rename from source/assets/images/blog/override-node-options-refactor-tests-new-passing.png rename to assets/images/blog/override-node-options-refactor-tests-new-passing.png diff --git a/source/assets/images/blog/tdd-drupal-1.png b/assets/images/blog/tdd-drupal-1.png similarity index 100% rename from source/assets/images/blog/tdd-drupal-1.png rename to assets/images/blog/tdd-drupal-1.png diff --git a/source/assets/images/blog/tdd-drupal-2.png b/assets/images/blog/tdd-drupal-2.png similarity index 100% rename from source/assets/images/blog/tdd-drupal-2.png rename to assets/images/blog/tdd-drupal-2.png diff --git a/source/assets/images/blog/tdd-drupal-3.png b/assets/images/blog/tdd-drupal-3.png similarity index 100% rename from source/assets/images/blog/tdd-drupal-3.png rename to assets/images/blog/tdd-drupal-3.png diff --git a/source/assets/images/blog/tdd-drupal-4.png b/assets/images/blog/tdd-drupal-4.png similarity index 100% rename from source/assets/images/blog/tdd-drupal-4.png rename to assets/images/blog/tdd-drupal-4.png diff --git a/source/assets/images/blog/using-tailwind-drupal/important-1.png b/assets/images/blog/using-tailwind-drupal/important-1.png similarity index 100% rename from source/assets/images/blog/using-tailwind-drupal/important-1.png rename to assets/images/blog/using-tailwind-drupal/important-1.png diff --git a/source/assets/images/blog/using-tailwind-drupal/important-2.png b/assets/images/blog/using-tailwind-drupal/important-2.png similarity index 100% rename from source/assets/images/blog/using-tailwind-drupal/important-2.png rename to assets/images/blog/using-tailwind-drupal/important-2.png diff --git a/source/assets/images/blog/using-tailwind-drupal/prefix-1.png b/assets/images/blog/using-tailwind-drupal/prefix-1.png similarity index 100% rename from source/assets/images/blog/using-tailwind-drupal/prefix-1.png rename to assets/images/blog/using-tailwind-drupal/prefix-1.png diff --git a/source/assets/images/blog/using-tailwind-drupal/prefix-2.png b/assets/images/blog/using-tailwind-drupal/prefix-2.png similarity index 100% rename from source/assets/images/blog/using-tailwind-drupal/prefix-2.png rename to assets/images/blog/using-tailwind-drupal/prefix-2.png diff --git a/source/assets/images/experience/appnovation.png b/assets/images/experience/appnovation.png similarity index 100% rename from source/assets/images/experience/appnovation.png rename to assets/images/experience/appnovation.png diff --git a/source/assets/images/experience/cti-digital.png b/assets/images/experience/cti-digital.png similarity index 100% rename from source/assets/images/experience/cti-digital.png rename to assets/images/experience/cti-digital.png diff --git a/source/assets/images/experience/drupal-association.png b/assets/images/experience/drupal-association.png similarity index 100% rename from source/assets/images/experience/drupal-association.png rename to assets/images/experience/drupal-association.png diff --git a/source/assets/images/experience/horse-and-country.jpg b/assets/images/experience/horse-and-country.jpg similarity index 100% rename from source/assets/images/experience/horse-and-country.jpg rename to assets/images/experience/horse-and-country.jpg diff --git a/source/assets/images/experience/lab-class.png b/assets/images/experience/lab-class.png similarity index 100% rename from source/assets/images/experience/lab-class.png rename to assets/images/experience/lab-class.png diff --git a/source/assets/images/experience/microserve.png b/assets/images/experience/microserve.png similarity index 100% rename from source/assets/images/experience/microserve.png rename to assets/images/experience/microserve.png diff --git a/source/assets/images/experience/nomensa.png b/assets/images/experience/nomensa.png similarity index 100% rename from source/assets/images/experience/nomensa.png rename to assets/images/experience/nomensa.png diff --git a/source/assets/images/experience/precedent.jpg b/assets/images/experience/precedent.jpg similarity index 100% rename from source/assets/images/experience/precedent.jpg rename to assets/images/experience/precedent.jpg diff --git a/source/assets/images/experience/proctors.jpg b/assets/images/experience/proctors.jpg similarity index 100% rename from source/assets/images/experience/proctors.jpg rename to assets/images/experience/proctors.jpg diff --git a/source/assets/images/me-phpnw.png b/assets/images/me-phpnw.png similarity index 100% rename from source/assets/images/me-phpnw.png rename to assets/images/me-phpnw.png diff --git a/source/assets/images/me-precedent.jpg b/assets/images/me-precedent.jpg similarity index 100% rename from source/assets/images/me-precedent.jpg rename to assets/images/me-precedent.jpg diff --git a/source/assets/images/meetups/accessible-bristol.png b/assets/images/meetups/accessible-bristol.png similarity index 100% rename from source/assets/images/meetups/accessible-bristol.png rename to assets/images/meetups/accessible-bristol.png diff --git a/source/assets/images/meetups/drupal-bristol.jpeg b/assets/images/meetups/drupal-bristol.jpeg similarity index 100% rename from source/assets/images/meetups/drupal-bristol.jpeg rename to assets/images/meetups/drupal-bristol.jpeg diff --git a/source/assets/images/meetups/drupalcamp-bristol.png b/assets/images/meetups/drupalcamp-bristol.png similarity index 100% rename from source/assets/images/meetups/drupalcamp-bristol.png rename to assets/images/meetups/drupalcamp-bristol.png diff --git a/source/assets/images/meetups/nwdug.jpg b/assets/images/meetups/nwdug.jpg similarity index 100% rename from source/assets/images/meetups/nwdug.jpg rename to assets/images/meetups/nwdug.jpg diff --git a/source/assets/images/meetups/phpnw.gif b/assets/images/meetups/phpnw.gif similarity index 100% rename from source/assets/images/meetups/phpnw.gif rename to assets/images/meetups/phpnw.gif diff --git a/source/assets/images/meetups/phpnw.jpg b/assets/images/meetups/phpnw.jpg similarity index 100% rename from source/assets/images/meetups/phpnw.jpg rename to assets/images/meetups/phpnw.jpg diff --git a/source/assets/images/meetups/phpsw.jpeg b/assets/images/meetups/phpsw.jpeg similarity index 100% rename from source/assets/images/meetups/phpsw.jpeg rename to assets/images/meetups/phpsw.jpeg diff --git a/source/assets/images/meetups/swdug.png b/assets/images/meetups/swdug.png similarity index 100% rename from source/assets/images/meetups/swdug.png rename to assets/images/meetups/swdug.png diff --git a/source/assets/images/meetups/swlug.png b/assets/images/meetups/swlug.png similarity index 100% rename from source/assets/images/meetups/swlug.png rename to assets/images/meetups/swlug.png diff --git a/source/assets/images/meetups/unified-diff.png b/assets/images/meetups/unified-diff.png similarity index 100% rename from source/assets/images/meetups/unified-diff.png rename to assets/images/meetups/unified-diff.png diff --git a/source/assets/images/talks/dancing-for-drupal.png b/assets/images/talks/dancing-for-drupal.png similarity index 100% rename from source/assets/images/talks/dancing-for-drupal.png rename to assets/images/talks/dancing-for-drupal.png diff --git a/source/assets/images/talks/dclondon16.png b/assets/images/talks/dclondon16.png similarity index 100% rename from source/assets/images/talks/dclondon16.png rename to assets/images/talks/dclondon16.png diff --git a/source/assets/images/talks/deploying-php-fabric.png b/assets/images/talks/deploying-php-fabric.png similarity index 100% rename from source/assets/images/talks/deploying-php-fabric.png rename to assets/images/talks/deploying-php-fabric.png diff --git a/source/assets/images/talks/drupal-8.png b/assets/images/talks/drupal-8.png similarity index 100% rename from source/assets/images/talks/drupal-8.png rename to assets/images/talks/drupal-8.png diff --git a/source/assets/images/talks/drupal-rejoining-php-herd.png b/assets/images/talks/drupal-rejoining-php-herd.png similarity index 100% rename from source/assets/images/talks/drupal-rejoining-php-herd.png rename to assets/images/talks/drupal-rejoining-php-herd.png diff --git a/source/assets/images/talks/drupal-vm-generator.png b/assets/images/talks/drupal-vm-generator.png similarity index 100% rename from source/assets/images/talks/drupal-vm-generator.png rename to assets/images/talks/drupal-vm-generator.png diff --git a/source/assets/images/talks/drupal-vm-meet-symfony-console.png b/assets/images/talks/drupal-vm-meet-symfony-console.png similarity index 100% rename from source/assets/images/talks/drupal-vm-meet-symfony-console.png rename to assets/images/talks/drupal-vm-meet-symfony-console.png diff --git a/source/assets/images/talks/drupalorg-2014-retrospective.png b/assets/images/talks/drupalorg-2014-retrospective.png similarity index 100% rename from source/assets/images/talks/drupalorg-2014-retrospective.png rename to assets/images/talks/drupalorg-2014-retrospective.png diff --git a/source/assets/images/talks/drush-make-composer.png b/assets/images/talks/drush-make-composer.png similarity index 100% rename from source/assets/images/talks/drush-make-composer.png rename to assets/images/talks/drush-make-composer.png diff --git a/source/assets/images/talks/drush-make-drupalbristol.png b/assets/images/talks/drush-make-drupalbristol.png similarity index 100% rename from source/assets/images/talks/drush-make-drupalbristol.png rename to assets/images/talks/drush-make-drupalbristol.png diff --git a/source/assets/images/talks/drush-make-is-dead-long-live-composer.png b/assets/images/talks/drush-make-is-dead-long-live-composer.png similarity index 100% rename from source/assets/images/talks/drush-make-is-dead-long-live-composer.png rename to assets/images/talks/drush-make-is-dead-long-live-composer.png diff --git a/source/assets/images/talks/fabric-drupal.png b/assets/images/talks/fabric-drupal.png similarity index 100% rename from source/assets/images/talks/fabric-drupal.png rename to assets/images/talks/fabric-drupal.png diff --git a/source/assets/images/talks/getting-your-data-into-drupal-8.png b/assets/images/talks/getting-your-data-into-drupal-8.png similarity index 100% rename from source/assets/images/talks/getting-your-data-into-drupal-8.png rename to assets/images/talks/getting-your-data-into-drupal-8.png diff --git a/source/assets/images/talks/git-flow.png b/assets/images/talks/git-flow.png similarity index 100% rename from source/assets/images/talks/git-flow.png rename to assets/images/talks/git-flow.png diff --git a/source/assets/images/talks/it-all-started-with-a-patch.png b/assets/images/talks/it-all-started-with-a-patch.png similarity index 100% rename from source/assets/images/talks/it-all-started-with-a-patch.png rename to assets/images/talks/it-all-started-with-a-patch.png diff --git a/source/assets/images/talks/laravel-collections.png b/assets/images/talks/laravel-collections.png similarity index 100% rename from source/assets/images/talks/laravel-collections.png rename to assets/images/talks/laravel-collections.png diff --git a/source/assets/images/talks/logos/drupal-bristol.jpg b/assets/images/talks/logos/drupal-bristol.jpg similarity index 100% rename from source/assets/images/talks/logos/drupal-bristol.jpg rename to assets/images/talks/logos/drupal-bristol.jpg diff --git a/source/assets/images/talks/logos/drupalcamp-brighton-2015.png b/assets/images/talks/logos/drupalcamp-brighton-2015.png similarity index 100% rename from source/assets/images/talks/logos/drupalcamp-brighton-2015.png rename to assets/images/talks/logos/drupalcamp-brighton-2015.png diff --git a/source/assets/images/talks/logos/drupalcamp-bristol-2016.png b/assets/images/talks/logos/drupalcamp-bristol-2016.png similarity index 100% rename from source/assets/images/talks/logos/drupalcamp-bristol-2016.png rename to assets/images/talks/logos/drupalcamp-bristol-2016.png diff --git a/source/assets/images/talks/logos/drupalcamp-london-2014.png b/assets/images/talks/logos/drupalcamp-london-2014.png similarity index 100% rename from source/assets/images/talks/logos/drupalcamp-london-2014.png rename to assets/images/talks/logos/drupalcamp-london-2014.png diff --git a/source/assets/images/talks/logos/drupalcamp-london-2015.png b/assets/images/talks/logos/drupalcamp-london-2015.png similarity index 100% rename from source/assets/images/talks/logos/drupalcamp-london-2015.png rename to assets/images/talks/logos/drupalcamp-london-2015.png diff --git a/source/assets/images/talks/logos/drupalcamp-london-2017.png b/assets/images/talks/logos/drupalcamp-london-2017.png similarity index 100% rename from source/assets/images/talks/logos/drupalcamp-london-2017.png rename to assets/images/talks/logos/drupalcamp-london-2017.png diff --git a/source/assets/images/talks/logos/drupalcamp-north-2015.png b/assets/images/talks/logos/drupalcamp-north-2015.png similarity index 100% rename from source/assets/images/talks/logos/drupalcamp-north-2015.png rename to assets/images/talks/logos/drupalcamp-north-2015.png diff --git a/source/assets/images/talks/logos/nomad-php.png b/assets/images/talks/logos/nomad-php.png similarity index 100% rename from source/assets/images/talks/logos/nomad-php.png rename to assets/images/talks/logos/nomad-php.png diff --git a/source/assets/images/talks/logos/nwdug.jpeg b/assets/images/talks/logos/nwdug.jpeg similarity index 100% rename from source/assets/images/talks/logos/nwdug.jpeg rename to assets/images/talks/logos/nwdug.jpeg diff --git a/source/assets/images/talks/logos/php-south-coast-2016.png b/assets/images/talks/logos/php-south-coast-2016.png similarity index 100% rename from source/assets/images/talks/logos/php-south-coast-2016.png rename to assets/images/talks/logos/php-south-coast-2016.png diff --git a/source/assets/images/talks/logos/phpsw.png b/assets/images/talks/logos/phpsw.png similarity index 100% rename from source/assets/images/talks/logos/phpsw.png rename to assets/images/talks/logos/phpsw.png diff --git a/source/assets/images/talks/logos/swdug.png b/assets/images/talks/logos/swdug.png similarity index 100% rename from source/assets/images/talks/logos/swdug.png rename to assets/images/talks/logos/swdug.png diff --git a/source/assets/images/talks/logos/umbristol.jpeg b/assets/images/talks/logos/umbristol.jpeg similarity index 100% rename from source/assets/images/talks/logos/umbristol.jpeg rename to assets/images/talks/logos/umbristol.jpeg diff --git a/source/assets/images/talks/logos/unified-diff.png b/assets/images/talks/logos/unified-diff.png similarity index 100% rename from source/assets/images/talks/logos/unified-diff.png rename to assets/images/talks/logos/unified-diff.png diff --git a/source/assets/images/talks/modern-drupal-development-composer.png b/assets/images/talks/modern-drupal-development-composer.png similarity index 100% rename from source/assets/images/talks/modern-drupal-development-composer.png rename to assets/images/talks/modern-drupal-development-composer.png diff --git a/source/assets/images/talks/static-websites-sculpin.png b/assets/images/talks/static-websites-sculpin.png similarity index 100% rename from source/assets/images/talks/static-websites-sculpin.png rename to assets/images/talks/static-websites-sculpin.png diff --git a/source/assets/images/talks/taking-flight-tailwind.png b/assets/images/talks/taking-flight-tailwind.png similarity index 100% rename from source/assets/images/talks/taking-flight-tailwind.png rename to assets/images/talks/taking-flight-tailwind.png diff --git a/source/assets/images/talks/test-drive-twig-sculpin.png b/assets/images/talks/test-drive-twig-sculpin.png similarity index 100% rename from source/assets/images/talks/test-drive-twig-sculpin.png rename to assets/images/talks/test-drive-twig-sculpin.png diff --git a/source/assets/images/talks/test-driven-drupal-development.png b/assets/images/talks/test-driven-drupal-development.png similarity index 100% rename from source/assets/images/talks/test-driven-drupal-development.png rename to assets/images/talks/test-driven-drupal-development.png diff --git a/source/assets/images/testimonials/brian-healy.png b/assets/images/testimonials/brian-healy.png similarity index 100% rename from source/assets/images/testimonials/brian-healy.png rename to assets/images/testimonials/brian-healy.png diff --git a/source/assets/images/testimonials/chris-jarvis.jpg b/assets/images/testimonials/chris-jarvis.jpg similarity index 100% rename from source/assets/images/testimonials/chris-jarvis.jpg rename to assets/images/testimonials/chris-jarvis.jpg diff --git a/source/assets/images/testimonials/ed-welsby.png b/assets/images/testimonials/ed-welsby.png similarity index 100% rename from source/assets/images/testimonials/ed-welsby.png rename to assets/images/testimonials/ed-welsby.png diff --git a/source/assets/images/testimonials/holly-ross.png b/assets/images/testimonials/holly-ross.png similarity index 100% rename from source/assets/images/testimonials/holly-ross.png rename to assets/images/testimonials/holly-ross.png diff --git a/source/assets/images/testimonials/james-chapman.png b/assets/images/testimonials/james-chapman.png similarity index 100% rename from source/assets/images/testimonials/james-chapman.png rename to assets/images/testimonials/james-chapman.png diff --git a/source/assets/images/testimonials/josh-mitchell.png b/assets/images/testimonials/josh-mitchell.png similarity index 100% rename from source/assets/images/testimonials/josh-mitchell.png rename to assets/images/testimonials/josh-mitchell.png diff --git a/source/assets/images/testimonials/leonie-watson.jpg b/assets/images/testimonials/leonie-watson.jpg similarity index 100% rename from source/assets/images/testimonials/leonie-watson.jpg rename to assets/images/testimonials/leonie-watson.jpg diff --git a/assets/less/main.less b/assets/less/main.less index 022f4d66..247b8710 100644 --- a/assets/less/main.less +++ b/assets/less/main.less @@ -1,5 +1,5 @@ -@import (less) "~font-awesome/css/font-awesome.css"; -@import (less) "~highlightjs/styles/github-gist.css"; +// @import (less) "~font-awesome/css/font-awesome.css"; +// @import (less) "~highlightjs/styles/github-gist.css"; @tailwind preflight; @@ -61,16 +61,17 @@ svg { fill: currentColor; } -.table-collapse { border-collapse: collapse } +.table-collapse { + border-collapse: collapse; +} -@import 'components/listing'; -@import 'components/nav'; -@import 'components/post'; -@import 'components/post/about-author'; -@import 'components/post/code'; -@import 'components/table'; -@import 'components/talk/slides'; -@import 'components/talk/video'; -@import 'components/testimonial'; +@import 'components/listing.less'; +@import 'components/nav.less'; +@import 'components/post.less'; +@import 'components/post/about-author.less'; +@import 'components/post/code.less'; +@import 'components/table.less'; +@import 'components/talk/slides.less'; +@import 'components/talk/video.less'; @tailwind utilities; diff --git a/fonts/vendor/font-awesome/fontawesome-webfont.eot b/fonts/vendor/font-awesome/fontawesome-webfont.eot new file mode 100644 index 00000000..e9f60ca9 Binary files /dev/null and b/fonts/vendor/font-awesome/fontawesome-webfont.eot differ diff --git a/fonts/vendor/font-awesome/fontawesome-webfont.svg b/fonts/vendor/font-awesome/fontawesome-webfont.svg new file mode 100644 index 00000000..855c845e --- /dev/null +++ b/fonts/vendor/font-awesome/fontawesome-webfont.svg @@ -0,0 +1,2671 @@ + + + + +Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 + By ,,, +Copyright Dave Gandy 2016. All rights reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fonts/vendor/font-awesome/fontawesome-webfont.ttf b/fonts/vendor/font-awesome/fontawesome-webfont.ttf new file mode 100644 index 00000000..35acda2f Binary files /dev/null and b/fonts/vendor/font-awesome/fontawesome-webfont.ttf differ diff --git a/fonts/vendor/font-awesome/fontawesome-webfont.woff b/fonts/vendor/font-awesome/fontawesome-webfont.woff new file mode 100644 index 00000000..400014a4 Binary files /dev/null and b/fonts/vendor/font-awesome/fontawesome-webfont.woff differ diff --git a/fonts/vendor/font-awesome/fontawesome-webfont.woff2 b/fonts/vendor/font-awesome/fontawesome-webfont.woff2 new file mode 100644 index 00000000..4d13fc60 Binary files /dev/null and b/fonts/vendor/font-awesome/fontawesome-webfont.woff2 differ diff --git a/images/loading.gif b/images/loading.gif new file mode 100644 index 00000000..ff0a7fc9 Binary files /dev/null and b/images/loading.gif differ diff --git a/package.json b/package.json index 7a8ac38e..1ef2e148 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,17 @@ { "private": true, + "scripts": { + "dev": "NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "hot": "NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "production": "NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + }, "devDependencies": { - "@symfony/webpack-encore": "^0.17.1", - "autoprefixer": "^7.2.4", "font-awesome": "^4.7.0", - "glob-all": "^3.1.0", "highlightjs": "^9.10.0", - "less": "^2.7.3", + "laravel-mix": "^2.0.0", + "less": "^3.0.0", "less-loader": "^4.0.5", - "less-plugin-npm-import": "^2.1.0", - "postcss-loader": "^2.0.10", - "purgecss-webpack-plugin": "^0.19.0", - "tailwindcss": "^0.4.0", - "webpack-notifier": "^1.5.0" + "tailwindcss": "^0.4.1" } } diff --git a/postcss.config.js b/postcss.config.js deleted file mode 100644 index ca0279a8..00000000 --- a/postcss.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - plugins: [ - require('tailwindcss')('./tailwind.js'), - require('autoprefixer'), - ] -} diff --git a/source/_includes/head.html.twig b/source/_includes/head.html.twig index c95afa0c..9f4c21ca 100644 --- a/source/_includes/head.html.twig +++ b/source/_includes/head.html.twig @@ -17,7 +17,8 @@ {% include 'og' with { og: page.meta.og } %} {% block stylesheets %} - + + {% endblock %} {% for size in site.apple_touch_icon_sizes %} diff --git a/source/_includes/scripts.html.twig b/source/_includes/scripts.html.twig index 2d34ffad..d27ebf56 100644 --- a/source/_includes/scripts.html.twig +++ b/source/_includes/scripts.html.twig @@ -1,5 +1,3 @@ - -