Merge branch 'encore'

2018-03-02 20:17:11 +00:00 · 2018-03-02 20:17:11 +00:00 · 6cb939c1b5
parent 876f93e68c c716ecb558
commit 6cb939c1b5
229 changed files with 1046 additions and 7845 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,4 @@
 /node_modules/
 /output_*/
-/source/assets/
+/source/build/
 /vendor/
-mix-manifest.json
-mix.js.map
--- a/2
+++ b/2
@ -9,7 +9,7 @@ clean:
 	rm -rf \
 		node_modules \
 		output_* \
-		source/assets \
+		source/build \
 		vendor

 init:
--- a/ansible/deploy/after-symlink-shared.yml
+++ b/ansible/deploy/after-symlink-shared.yml
@ -10,8 +10,8 @@
 - name: Install Node dependencies
  command: yarn install chdir={{ ansistrano_release_path.stdout }}

- name: Generate assets with Laravel Mix
-  command: yarn run production chdir={{ ansistrano_release_path.stdout }}
+- name: Generate assets
+  command: yarn run encore production chdir={{ ansistrano_release_path.stdout }}

 - name: Generate the site, including assets
  command: composer run prod chdir={{ ansistrano_release_path.stdout }}
--- a/assets/less/components/listing.less
+++ b/assets/less/components/listing.less
@ -11,6 +11,6 @@
    }
 }

-.listing-item p:last-of-type {
-    @apply .mb-0;
-}
+// .listing-item p:last-of-type {
+//     @apply .mb-0;
+// }
--- a/assets/less/main.less
+++ b/assets/less/main.less
@ -1,3 +1,6 @@
+@import (less) "~font-awesome/css/font-awesome.css";
+@import (less) "~highlightjs/styles/github-gist.css";
+
@tailwind preflight;

 p,
--- 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",
-    "laravel-mix": "^2.0.0",
-    "less": "^3.0.0",
+    "less": "^2.7.3",
    "less-loader": "^4.0.5",
-    "tailwindcss": "^0.4.1"
+    "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"
  }
 }
--- a/postcss.config.js
+++ b/postcss.config.js
@ -0,0 +1,6 @@
+module.exports = {
+    plugins: [
+        require('tailwindcss')('./tailwind.js'),
+        require('autoprefixer'),
+    ]
+}
--- a/source/_includes/head.html.twig
+++ b/source/_includes/head.html.twig
@ -17,8 +17,7 @@
    {% include 'og' with { og: page.meta.og } %}

    {% block stylesheets %}
-        <link rel="stylesheet" href="{{ site.url }}/assets/css/vendor.css">
-        <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
+        <link rel="stylesheet" href="{{ site.url }}/build/css/site.css">
    {% endblock %}

    {% for size in site.apple_touch_icon_sizes %}
--- a/source/_includes/talk/slides.html.twig
+++ b/source/_includes/talk/slides.html.twig
@ -1,5 +1,5 @@
 {% if page.speakerdeck.id and page.speakerdeck.ratio %}
-    <div class="mt-4">
+    <div class="talk-slides mt-4">
        <h2>Slides</h2>

        <noscript>**Please enable JavaScript to view slides.**</noscript>
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="no-js" lang="en-GB">
    {% include 'head.html.twig' %}
-    <body class="text-grey-darkest text-sm leading-normal">
+    <body class="text-grey-darkest text-sm leading-normal border-t-3 border-blue">
        {% include 'nav.html.twig' %}

        {% block breadcrumb %}{% endblock %}
--- a/source/_posts/2018-02-05-using-tailwind-css-in-your-drupal-theme.md
+++ b/source/_posts/2018-02-05-using-tailwind-css-in-your-drupal-theme.md
@ -7,12 +7,15 @@ tags:
    - drupal-theming
    - tailwind-css
 ---
+{% block excerpt %}
 ## What is Tailwind?

 > Tailwind is a utility-first CSS framework for rapidly building custom user interfaces.

 It generates a number of utility classes that you can add to your theme's markup to apply different styling, as well as the ability to apply classes to other markup and create components comprised of utility classes using a custom `@apply` PostCSS directive.
+{% endblock %}

+{% block content %}
 ## Initial Configuration

 The installation and configuration steps are essentially the same as those outlined within the [Tailwind documentation][1], and should be performed within your custom theme's directory (e.g. `sites/all/themes/custom/mytheme` for Drupal 7 or `themes/custom/mytheme` for Drupal 8:
@ -84,6 +87,7 @@ With the `!important` rule enabled though, the Tailwind’s class takes preceden
 ## Example

 For an example of Tailwind within a Drupal 8 theme, see the custom theme for the [Drupal Bristol website][0] on GitHub.
+{% endblock %}

 [0]: https://github.com/drupalbristol/drupal-bristol-website/tree/master/web/themes/custom/drupalbristol
 [1]: https://tailwindcss.com/docs/installation
--- a/source/assets/fonts/FontAwesome.otf
+++ b/source/assets/fonts/FontAwesome.otf
--- a/source/assets/fonts/fontawesome-webfont.eot
+++ b/source/assets/fonts/fontawesome-webfont.eot
--- a/source/assets/fonts/fontawesome-webfont.svg
+++ b/source/assets/fonts/fontawesome-webfont.svg
--- a/source/assets/fonts/fontawesome-webfont.ttf
+++ b/source/assets/fonts/fontawesome-webfont.ttf
--- a/source/assets/fonts/fontawesome-webfont.woff
+++ b/source/assets/fonts/fontawesome-webfont.woff
--- a/source/assets/fonts/fontawesome-webfont.woff2
+++ b/source/assets/fonts/fontawesome-webfont.woff2
--- a/source/assets/fonts/vendor/font-awesome/fontawesome-webfont.eot
+++ b/source/assets/fonts/vendor/font-awesome/fontawesome-webfont.eot
--- a/source/assets/fonts/vendor/font-awesome/fontawesome-webfont.svg
+++ b/source/assets/fonts/vendor/font-awesome/fontawesome-webfont.svg
--- a/source/assets/fonts/vendor/font-awesome/fontawesome-webfont.ttf
+++ b/source/assets/fonts/vendor/font-awesome/fontawesome-webfont.ttf
--- a/source/assets/fonts/vendor/font-awesome/fontawesome-webfont.woff
+++ b/source/assets/fonts/vendor/font-awesome/fontawesome-webfont.woff
--- a/source/assets/fonts/vendor/font-awesome/fontawesome-webfont.woff2
+++ b/source/assets/fonts/vendor/font-awesome/fontawesome-webfont.woff2
--- a/source/assets/images/badges/acquia-d8-back-end.png
+++ b/source/assets/images/badges/acquia-d8-back-end.png
--- a/source/assets/images/badges/acquia-d8-developer.png
+++ b/source/assets/images/badges/acquia-d8-developer.png
--- a/source/assets/images/badges/acquia-d8-front-end.png
+++ b/source/assets/images/badges/acquia-d8-front-end.png
--- a/source/assets/images/badges/acquia-d8-grand-master.png
+++ b/source/assets/images/badges/acquia-d8-grand-master.png
--- a/source/assets/images/badges/da-individual-member.png
+++ b/source/assets/images/badges/da-individual-member.png
--- a/source/assets/images/badges/drupal-8.jpg
+++ b/source/assets/images/badges/drupal-8.jpg
--- a/source/assets/images/badges/phpnw17.png
+++ b/source/assets/images/badges/phpnw17.png
--- a/source/assets/images/blog/custom-module-as-a-feature.png
+++ b/source/assets/images/blog/custom-module-as-a-feature.png
--- a/source/assets/images/blog/drupal-meetups-twitterbot.png
+++ b/source/assets/images/blog/drupal-meetups-twitterbot.png
--- a/source/assets/images/blog/drupalcamp-bristol-17-logo.jpg
+++ b/source/assets/images/blog/drupalcamp-bristol-17-logo.jpg
--- a/source/assets/images/blog/drupalcamp-dublin.jpg
+++ b/source/assets/images/blog/drupalcamp-dublin.jpg
--- a/source/assets/images/blog/drupalvm-generate-example-2.gif
+++ b/source/assets/images/blog/drupalvm-generate-example-2.gif
--- a/source/assets/images/blog/drupalvm-generate-example.gif
+++ b/source/assets/images/blog/drupalvm-generate-example.gif
--- a/source/assets/images/blog/drupalvm-generate-release.png
+++ b/source/assets/images/blog/drupalvm-generate-release.png
--- a/source/assets/images/blog/drupalvm-generate-repo.png
+++ b/source/assets/images/blog/drupalvm-generate-repo.png
--- a/source/assets/images/blog/forked-github-repo-commits.png
+++ b/source/assets/images/blog/forked-github-repo-commits.png
--- a/source/assets/images/blog/git-format-patch.png
+++ b/source/assets/images/blog/git-format-patch.png
--- a/source/assets/images/blog/github-fork-rebase-phpstorm.png
+++ b/source/assets/images/blog/github-fork-rebase-phpstorm.png
--- a/source/assets/images/blog/github-pages.png
+++ b/source/assets/images/blog/github-pages.png
--- a/source/assets/images/blog/jackson-octocat.png
+++ b/source/assets/images/blog/jackson-octocat.png
--- a/source/assets/images/blog/minimum-drupal-version-d7.png
+++ b/source/assets/images/blog/minimum-drupal-version-d7.png
--- a/source/assets/images/blog/my-commit-to-the-rebased-branch.png
+++ b/source/assets/images/blog/my-commit-to-the-rebased-branch.png
--- a/source/assets/images/blog/nginx-redirect-with-args.gif
+++ b/source/assets/images/blog/nginx-redirect-with-args.gif
--- a/source/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png
+++ b/source/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png
--- a/source/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png
+++ b/source/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png
--- a/source/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png
+++ b/source/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png
--- a/source/assets/images/blog/oliverdavies-uk-jenkins-shell.png
+++ b/source/assets/images/blog/oliverdavies-uk-jenkins-shell.png
--- a/source/assets/images/blog/override-node-options-refactor-tests-new-passing.png
+++ b/source/assets/images/blog/override-node-options-refactor-tests-new-passing.png
--- a/source/assets/images/blog/private-message-queue.png
+++ b/source/assets/images/blog/private-message-queue.png
--- a/source/assets/images/blog/tdd-drupal-1.png
+++ b/source/assets/images/blog/tdd-drupal-1.png
--- a/source/assets/images/blog/tdd-drupal-2.png
+++ b/source/assets/images/blog/tdd-drupal-2.png
--- a/source/assets/images/blog/tdd-drupal-3.png
+++ b/source/assets/images/blog/tdd-drupal-3.png
--- a/source/assets/images/blog/tdd-drupal-4.png
+++ b/source/assets/images/blog/tdd-drupal-4.png
--- a/source/assets/images/blog/using-tailwind-drupal/important-1.png
+++ b/source/assets/images/blog/using-tailwind-drupal/important-1.png
--- a/source/assets/images/blog/using-tailwind-drupal/important-2.png
+++ b/source/assets/images/blog/using-tailwind-drupal/important-2.png
--- a/source/assets/images/blog/using-tailwind-drupal/prefix-1.png
+++ b/source/assets/images/blog/using-tailwind-drupal/prefix-1.png
--- a/source/assets/images/blog/using-tailwind-drupal/prefix-2.png
+++ b/source/assets/images/blog/using-tailwind-drupal/prefix-2.png
--- a/source/assets/images/experience/appnovation.png
+++ b/source/assets/images/experience/appnovation.png
--- a/source/assets/images/experience/cti-digital.png
+++ b/source/assets/images/experience/cti-digital.png
--- a/source/assets/images/experience/drupal-association.png
+++ b/source/assets/images/experience/drupal-association.png
--- a/source/assets/images/experience/horse-and-country.jpg
+++ b/source/assets/images/experience/horse-and-country.jpg
--- a/source/assets/images/experience/lab-class.png
+++ b/source/assets/images/experience/lab-class.png
--- a/source/assets/images/experience/microserve.png
+++ b/source/assets/images/experience/microserve.png
--- a/source/assets/images/experience/nomensa.png
+++ b/source/assets/images/experience/nomensa.png
--- a/source/assets/images/experience/precedent.jpg
+++ b/source/assets/images/experience/precedent.jpg
--- a/source/assets/images/experience/proctors.jpg
+++ b/source/assets/images/experience/proctors.jpg
--- a/source/assets/images/images/badges/acquia-d8-back-end.png
+++ b/source/assets/images/images/badges/acquia-d8-back-end.png
--- a/source/assets/images/images/badges/acquia-d8-developer.png
+++ b/source/assets/images/images/badges/acquia-d8-developer.png
--- a/source/assets/images/images/badges/acquia-d8-front-end.png
+++ b/source/assets/images/images/badges/acquia-d8-front-end.png
--- a/source/assets/images/images/badges/acquia-d8-grand-master.png
+++ b/source/assets/images/images/badges/acquia-d8-grand-master.png
--- a/source/assets/images/images/badges/da-individual-member.png
+++ b/source/assets/images/images/badges/da-individual-member.png
--- a/source/assets/images/images/badges/drupal-8.jpg
+++ b/source/assets/images/images/badges/drupal-8.jpg
--- a/source/assets/images/images/badges/phpnw17.png
+++ b/source/assets/images/images/badges/phpnw17.png
--- a/source/assets/images/images/blog/custom-module-as-a-feature.png
+++ b/source/assets/images/images/blog/custom-module-as-a-feature.png
--- a/source/assets/images/images/blog/drupal-meetups-twitterbot.png
+++ b/source/assets/images/images/blog/drupal-meetups-twitterbot.png
--- a/source/assets/images/images/blog/drupalcamp-bristol-17-logo.jpg
+++ b/source/assets/images/images/blog/drupalcamp-bristol-17-logo.jpg
--- a/source/assets/images/images/blog/drupalcamp-dublin.jpg
+++ b/source/assets/images/images/blog/drupalcamp-dublin.jpg
--- a/source/assets/images/images/blog/drupalvm-generate-example-2.gif
+++ b/source/assets/images/images/blog/drupalvm-generate-example-2.gif
--- a/source/assets/images/images/blog/drupalvm-generate-example.gif
+++ b/source/assets/images/images/blog/drupalvm-generate-example.gif
--- a/source/assets/images/images/blog/drupalvm-generate-release.png
+++ b/source/assets/images/images/blog/drupalvm-generate-release.png
--- a/source/assets/images/images/blog/drupalvm-generate-repo.png
+++ b/source/assets/images/images/blog/drupalvm-generate-repo.png
--- a/source/assets/images/images/blog/forked-github-repo-commits.png
+++ b/source/assets/images/images/blog/forked-github-repo-commits.png
--- a/source/assets/images/images/blog/git-format-patch.png
+++ b/source/assets/images/images/blog/git-format-patch.png
--- a/source/assets/images/images/blog/github-fork-rebase-phpstorm.png
+++ b/source/assets/images/images/blog/github-fork-rebase-phpstorm.png
--- a/source/assets/images/images/blog/github-pages.png
+++ b/source/assets/images/images/blog/github-pages.png
--- a/source/assets/images/images/blog/jackson-octocat.png
+++ b/source/assets/images/images/blog/jackson-octocat.png
--- a/source/assets/images/images/blog/minimum-drupal-version-d7.png
+++ b/source/assets/images/images/blog/minimum-drupal-version-d7.png
--- a/source/assets/images/images/blog/my-commit-to-the-rebased-branch.png
+++ b/source/assets/images/images/blog/my-commit-to-the-rebased-branch.png
--- a/source/assets/images/images/blog/nginx-redirect-with-args.gif
+++ b/source/assets/images/images/blog/nginx-redirect-with-args.gif
--- a/source/assets/images/images/blog/oliverdavies-uk-jenkins-git-poll.png
+++ b/source/assets/images/images/blog/oliverdavies-uk-jenkins-git-poll.png
--- a/source/assets/images/images/blog/oliverdavies-uk-jenkins-git-repo.png
+++ b/source/assets/images/images/blog/oliverdavies-uk-jenkins-git-repo.png
--- a/source/assets/images/images/blog/oliverdavies-uk-jenkins-git-timer.png
+++ b/source/assets/images/images/blog/oliverdavies-uk-jenkins-git-timer.png
--- a/source/assets/images/images/blog/oliverdavies-uk-jenkins-shell.png
+++ b/source/assets/images/images/blog/oliverdavies-uk-jenkins-shell.png
--- a/source/assets/images/images/blog/override-node-options-refactor-tests-new-passing.png
+++ b/source/assets/images/images/blog/override-node-options-refactor-tests-new-passing.png
--- a/source/assets/images/images/blog/private-message-queue.png
+++ b/source/assets/images/images/blog/private-message-queue.png
--- a/source/assets/images/images/blog/tdd-drupal-1.png
+++ b/source/assets/images/images/blog/tdd-drupal-1.png
--- a/source/assets/images/images/blog/tdd-drupal-2.png
+++ b/source/assets/images/images/blog/tdd-drupal-2.png
--- a/source/assets/images/images/blog/tdd-drupal-3.png
+++ b/source/assets/images/images/blog/tdd-drupal-3.png
--- a/Show more
+++ b/Show more