Merge branch 'encore'

This commit is contained in:
Oliver Davies 2018-03-02 20:17:11 +00:00
commit 6cb939c1b5
229 changed files with 1046 additions and 7845 deletions
.gitignoreMakefile
ansible/deploy
assets/less
package.jsonpostcss.config.js
source
_includes
_layouts
_posts
assets
fonts
images
badges
blog
experience
images

4
.gitignore vendored
View file

@ -1,6 +1,4 @@
/node_modules/
/output_*/
/source/assets/
/source/build/
/vendor/
mix-manifest.json
mix.js.map

View file

@ -9,7 +9,7 @@ clean:
rm -rf \
node_modules \
output_* \
source/assets \
source/build \
vendor
init:

View file

@ -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 }}

View file

@ -11,6 +11,6 @@
}
}
.listing-item p:last-of-type {
@apply .mb-0;
}
// .listing-item p:last-of-type {
// @apply .mb-0;
// }

View file

@ -1,3 +1,6 @@
@import (less) "~font-awesome/css/font-awesome.css";
@import (less) "~highlightjs/styles/github-gist.css";
@tailwind preflight;
p,

View file

@ -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"
}
}

6
postcss.config.js Normal file
View file

@ -0,0 +1,6 @@
module.exports = {
plugins: [
require('tailwindcss')('./tailwind.js'),
require('autoprefixer'),
]
}

View file

@ -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 %}

View file

@ -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>

View file

@ -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 %}

View file

@ -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 Tailwinds 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

Binary file not shown.

File diff suppressed because it is too large Load diff

Before

(image error) Size: 434 KiB

File diff suppressed because it is too large Load diff

Before

(image error) Size: 434 KiB

View file

Before

(image error) Size: 25 KiB

After

(image error) Size: 25 KiB

Before After
Before After

View file

Before

(image error) Size: 23 KiB

After

(image error) Size: 23 KiB

Before After
Before After

View file

Before

(image error) Size: 24 KiB

After

(image error) Size: 24 KiB

Before After
Before After

View file

Before

(image error) Size: 27 KiB

After

(image error) Size: 27 KiB

Before After
Before After

View file

Before

(image error) Size: 33 KiB

After

(image error) Size: 33 KiB

Before After
Before After

View file

Before

(image error) Size: 14 KiB

After

(image error) Size: 14 KiB

Before After
Before After

View file

Before

(image error) Size: 94 KiB

After

(image error) Size: 94 KiB

Before After
Before After

View file

Before

(image error) Size: 106 KiB

After

(image error) Size: 106 KiB

Before After
Before After

View file

Before

(image error) Size: 323 KiB

After

(image error) Size: 323 KiB

Before After
Before After

View file

Before

(image error) Size: 13 KiB

After

(image error) Size: 13 KiB

Before After
Before After

View file

Before

(image error) Size: 88 KiB

After

(image error) Size: 88 KiB

Before After
Before After

View file

Before

(image error) Size: 74 KiB

After

(image error) Size: 74 KiB

Before After
Before After

View file

Before

(image error) Size: 236 KiB

After

(image error) Size: 236 KiB

Before After
Before After

View file

Before

(image error) Size: 652 KiB

After

(image error) Size: 652 KiB

Before After
Before After

View file

Before

(image error) Size: 316 KiB

After

(image error) Size: 316 KiB

Before After
Before After

View file

Before

(image error) Size: 406 KiB

After

(image error) Size: 406 KiB

Before After
Before After

View file

Before

(image error) Size: 394 KiB

After

(image error) Size: 394 KiB

Before After
Before After

View file

Before

(image error) Size: 367 KiB

After

(image error) Size: 367 KiB

Before After
Before After

View file

Before

(image error) Size: 7.9 KiB

After

(image error) Size: 7.9 KiB

Before After
Before After

View file

Before

(image error) Size: 10 KiB

After

(image error) Size: 10 KiB

Before After
Before After

View file

Before

(image error) Size: 9.2 KiB

After

(image error) Size: 9.2 KiB

Before After
Before After

View file

Before

(image error) Size: 86 KiB

After

(image error) Size: 86 KiB

Before After
Before After

View file

Before

(image error) Size: 707 B

After

(image error) Size: 707 B

Before After
Before After

View file

Before

(image error) Size: 6.9 KiB

After

(image error) Size: 6.9 KiB

Before After
Before After

View file

Before

(image error) Size: 5.3 KiB

After

(image error) Size: 5.3 KiB

Before After
Before After

View file

Before

(image error) Size: 46 KiB

After

(image error) Size: 46 KiB

Before After
Before After

View file

Before

(image error) Size: 4.8 KiB

After

(image error) Size: 4.8 KiB

Before After
Before After

Binary file not shown.

After

(image error) Size: 25 KiB

Binary file not shown.

After

(image error) Size: 23 KiB

Binary file not shown.

After

(image error) Size: 24 KiB

Binary file not shown.

After

(image error) Size: 27 KiB

Binary file not shown.

After

(image error) Size: 33 KiB

Binary file not shown.

After

(image error) Size: 14 KiB

Binary file not shown.

After

(image error) Size: 94 KiB

Binary file not shown.

After

(image error) Size: 31 KiB

Binary file not shown.

After

(image error) Size: 285 KiB

Binary file not shown.

After

(image error) Size: 22 KiB

Binary file not shown.

After

(image error) Size: 106 KiB

Binary file not shown.

After

(image error) Size: 884 KiB

Binary file not shown.

After

(image error) Size: 275 KiB

Binary file not shown.

After

(image error) Size: 249 KiB

Binary file not shown.

After

(image error) Size: 323 KiB

Binary file not shown.

After

(image error) Size: 40 KiB

Binary file not shown.

After

(image error) Size: 13 KiB

Binary file not shown.

After

(image error) Size: 42 KiB

Binary file not shown.

After

(image error) Size: 88 KiB

Binary file not shown.

After

(image error) Size: 74 KiB

Binary file not shown.

After

(image error) Size: 5.9 KiB

Binary file not shown.

After

(image error) Size: 24 KiB

Binary file not shown.

After

(image error) Size: 236 KiB

Binary file not shown.

After

(image error) Size: 13 KiB

Binary file not shown.

After

(image error) Size: 21 KiB

Binary file not shown.

After

(image error) Size: 12 KiB

Binary file not shown.

After

(image error) Size: 27 KiB

Binary file not shown.

After

(image error) Size: 213 KiB

Binary file not shown.

After

(image error) Size: 652 KiB

Binary file not shown.

After

(image error) Size: 316 KiB

Binary file not shown.

After

(image error) Size: 406 KiB

Binary file not shown.

After

(image error) Size: 394 KiB

Some files were not shown because too many files have changed in this diff Show more