opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into drupal-somerset

Browse source
This commit is contained in:
Oliver Davies 2017-10-24 23:59:02 +01:00
parent cf02f0ad83 1b73fedd9c
commit 6b07d8b397
12 changed files with 650 additions and 2217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/data/events.yml
View file

@ -111,7 +111,6 @@ events:
- event: swdug
date: '2014-08-19'
talk_title: About the Drupal Association
# type: Talk
- event: drupalcamp-brighton-15
date: '2015-01-18'

2
assets/js/main.js
View file

@ -5,5 +5,5 @@
e.preventDefault();
$(this).siblings('.nav-right').toggleClass('is-active');
})
});
})(jQuery);

4
assets/less/components/nav.less
View file

@ -6,9 +6,7 @@
.ml3;
.pv3;
&:first-child {
.ml0;
}
&:first-child { .ml0 }
}
.nav-item--active {

5
assets/less/components/post.less
View file

@ -5,10 +5,7 @@ pre {
word-wrap: no-wrap;
}
pre[class*="language-"] {
.bn;
.br0;
}
pre[class*="language-"] { .bn; .br0 }
pre code {
.pre;

4
assets/less/components/talk.less
View file

@ -1,6 +1,4 @@
.video {
padding-top: 56.25%;
}
.video { padding-top: 56.25% }
.video iframe,
.video embed {

19
assets/less/main.less
View file

@ -1,15 +1,16 @@
@import "node_modules/tachyons-less/less/_colors";
@import (less) "~font-awesome/css/font-awesome.css";
@import (less) "~prismjs/themes/prism-twilight.css";
@import "~tachyons-less/less/_colors";
@blue: #0678be;
@import "node_modules/tachyons-less/tachyons";
@import "~tachyons-less/tachyons";
p,
li,
td {
a {
color: @blue;
}
a { color: @blue }
}
.button {
@ -30,6 +31,14 @@ td {
}
}
blockquote {
.ma0;
.pl3;
.bl;
.bw2;
.b--blue;
}
@import "components/nav";
@import "components/post";
@import "components/talk";

27
gulpfile.config.js
View file

@ -1,27 +0,0 @@
module.exports = function (plugins) {
return {
less: {
autoprefixer: {
browsers: ["last 2 versions", "> 5%"],
cascade: false
},
sourceDir: "assets/less",
pattern: "/**/*.less",
purifyCss: [
'source/**/*.html',
'source/**/*.md',
'source/**/*.twig'
],
outputDir: "source/assets/css"
},
fonts: {
outputDir: "source/assets/fonts"
},
js: {
sourceDir: "assets/js",
pattern: "/**/*.js",
outputDir: "source/assets/js"
},
production: !!plugins.util.env.production
}
}

73
gulpfile.js
View file

@ -1,73 +0,0 @@
'use strict';
var gulp = require('gulp');
var plugins = require('gulp-load-plugins')();
var config = require('./gulpfile.config')(plugins);
var del = require('del');
var app = {};
app.copy = function (sourceFiles, destination) {
return gulp.src(sourceFiles)
.pipe(gulp.dest(destination));
};
app.css = function (sourceFiles, outputFile) {
return gulp.src(sourceFiles)
.pipe(plugins.plumber())
.pipe(plugins.if(!config.production, plugins.sourcemaps.init()))
.pipe(plugins.sassGlob())
.pipe(plugins.less())
.pipe(plugins.autoprefixer(config.less.autoprefixer))
.pipe(plugins.concat(outputFile))
.pipe(plugins.if(config.production, plugins.purifycss(config.less.purifyCss)))
.pipe(plugins.if(config.production, plugins.cleanCss()))
.pipe(plugins.if(!config.production, plugins.sourcemaps.write('.')))
.pipe(plugins.if(!config.production, plugins.refresh()))
.pipe(gulp.dest(config.less.outputDir));
};
app.js = function (sourceFiles, outputFile) {
return gulp.src(sourceFiles)
.pipe(plugins.plumber())
.pipe(plugins.if(!config.production, plugins.sourcemaps.init()))
.pipe(plugins.concat(outputFile))
.pipe(plugins.if(config.production, plugins.uglify()))
.pipe(plugins.if(!config.production, plugins.sourcemaps.write('.')))
.pipe(gulp.dest(config.js.outputDir));
};
gulp.task('clean', function () {
del.sync('source/assets/{css,fonts,js}');
del.sync('output_*/assets/{css,fonts,js}');
});
gulp.task('default', ['clean', 'fonts', 'styles', 'scripts']);
gulp.task('fonts', function () {
return app.copy('node_modules/font-awesome/fonts/*', config.fonts.outputDir);
});
gulp.task('styles', function () {
app.css([
'node_modules/font-awesome/css/font-awesome.css',
'node_modules/prismjs/themes/prism-twilight.css',
config.less.sourceDir + '/main.less'
], 'site.css');
});
gulp.task('scripts', function () {
app.js([
'node_modules/jquery/dist/jquery.js',
'node_modules/prismjs/prism.js',
'node_modules/prismjs/components/prism-{apacheconf,bsash,css,diff,ini,json,nginx,php,sass,scss,sql,less,twig,xml,yaml}.js',
config.js.sourceDir + '/**/*.js'
], 'site.js')
});
gulp.task('watch', ['default'], function () {
plugins.refresh.listen();
gulp.watch(config.less.sourceDir + config.less.pattern, ['styles']);
gulp.watch(config.js.sourceDir + config.js.pattern, ['scripts']);
});

48
package.json
View file

@ -1,25 +1,37 @@
{
"config": {
"lessPath": "./assets/less",
"jsPath": "./assets/js",
"outputCss": "./source/assets/css",
"outputFonts": "./source/assets/fonts",
"outputJs": "./source/assets/js"
},
"scripts": {
"autoprefixer": "postcss -u autoprefixer -r $npm_package_config_outputCss/*.css",
"build": "npm run init && npm-run-all -p build:css build:js copy:fonts",
"build:css": "npm run less -- && npm run autoprefixer",
"build:js": "concat -o $npm_package_config_outputJs/site.js ./node_modules/jquery/dist/jquery.js ./node_modules/prismjs/prism.js ./node_modules/prismjs/components/prism-{apacheconf,bash,css,diff,ini,json,nginx,php,sass,scss,sql,less,twig,yaml}.js $npm_package_config_jsPath/vendor/*.js $npm_package_config_jsPath/main.js",
"copy:fonts": "cp -R ./node_modules/font-awesome/fonts/* $npm_package_config_outputFonts",
"dev": "npm run build && npm-run-all -p watch:css watch:js",
"init": "mkdir -p $npm_package_config_outputCss $npm_package_config_outputFonts $npm_package_config_outputJs",
"less": "lessc --npm-import='prefix=~' $npm_package_config_lessPath/main.less $npm_package_config_outputCss/site.css",
"prod": "npm run build",
"watch:css": "onchange $npm_package_config_lessPath -v -- npm-run-all -p build:css",
"watch:js": "onchange $npm_package_config_jsPath -v -- npm-run-all -p build:js"
},
"dependencies": {
"del": "^3.0.0",
"autoprefixer": "^7.1.5",
"concat": "^1.0.3",
"font-awesome": "^4.7.0",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^4.0.0",
"gulp-clean-css": "^3.7.0",
"gulp-concat": "^2.6.1",
"gulp-if": "^2.0.2",
"gulp-less": "^3.3.2",
"gulp-load-plugins": "^1.5.0",
"gulp-plumber": "^1.1.0",
"gulp-purifycss": "^0.2.0",
"gulp-refresh": "^1.1.0",
"gulp-sass": "^3.1.0",
"gulp-sass-glob": "^1.0.8",
"gulp-sourcemaps": "^2.6.0",
"gulp-uglify": "^3.0.0",
"gulp-util": "^3.0.8",
"graceful-fs": "^4.1.11",
"jquery.2": "^1.0.0",
"less": "2.7.1",
"less-plugin-clean-css": "^1.5.1",
"less-plugin-npm-import": "^2.1.0",
"npm-run-all": "^4.1.1",
"onchange": "^3.2.1",
"postcss-cli": "^4.1.1",
"prismjs": "^1.6.0",
"tachyons-less": "^1.0.4",
"tachyons-sass": "^4.7.4"
"tachyons-less": "^1.0.4"
}
}

4
source/_talks/deploying-drupal-fabric.md
View file

@ -3,8 +3,8 @@ talk_id: 19
title: 'Deploying Drupal with Fabric'
type: Talk
slides:
url: ~
embed: ~
url: 'https://speakerdeck.com/opdavies/deploying-drupal-and-anything-else-with-fabric'
embed: '<script async class="speakerdeck-embed" data-id="40d1eca4bd484afc86295924fff5dd41" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>'
video:
embed: ~
url: ~

4
source/_talks/tdd-test-driven-drupal.md
View file

@ -2,8 +2,8 @@
talk_id: 17
title: TDD - Test Driven Drupal
slides:
url: https://speakerdeck.com/opdavies/test-driven-drupal-development-with-simpletest-and-phpunit-drupalcamp-london-17
embed: '<script async class="speakerdeck-embed" data-id="4f12722ed400468b93ebb32a23b3c757" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>'
url: 'https://speakerdeck.com/opdavies/tdd-test-driven-drupal'
embed: '<script async class="speakerdeck-embed" data-id="088cb18033064f5cb18d1079795294a1" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>'
video:
url: https://www.youtube.com/watch?v=fdbxXOi2HP4
embed: <iframe width="560" height="315" src="https://www.youtube.com/embed/fdbxXOi2HP4" frameborder="0" allowfullscreen></iframe>

2676
yarn.lock
View file

File diff suppressed because it is too large Load diff