Merge branch 'split-stylesheets' into source

assets/sass/blog.sass

@@ -1,10 +1,8 @@
 .page--blog__list
     ul.posts
-        //list-style: none
         margin-bottom: 2em
         margin-left: 0
         margin-top: 0
-        //padding-left: 0
 
     .post
         border-bottom: 1px solid #CCC

assets/sass/experience.sass

@@ -1,8 +1,5 @@
-@import '../mixins'
+@import "node_modules/bulma/sass/utilities/initial-variables"
-
+@import "node_modules/bulma/sass/utilities/mixins"
-.experience-item
-    // margin-bottom: $padding-large-vertical * 3
-    +clearfix
 
 .experience-item-website
     margin-bottom: 2px

assets/sass/main.sass

@@ -19,11 +19,3 @@ $primary: $blue
 @import 'components/badges'
 @import 'components/footer'
 @import 'components/meetups'
-
-@import "pages/about"
-@import "pages/blog"
-@import "pages/experience"
-@import "pages/post"
-@import "pages/project"
-@import "pages/talk"
-@import "pages/testimonials"

assets/sass/project.sass

@@ -1,4 +1,5 @@
-@import '../mixins'
+@import "node_modules/bulma/sass/utilities/initial-variables"
+@import "node_modules/bulma/sass/utilities/mixins"
 
 .project-company
     &.has-logo

assets/sass/talk.sass

@@ -1,3 +1,6 @@
+@import "node_modules/bulma/sass/utilities/initial-variables"
+@import "node_modules/bulma/sass/utilities/mixins"
+
 .talk-slides
     background: url('../images/loading.gif') no-repeat center
     min-height: 275px

gulp-tasks/clean.js

@@ -1,8 +0,0 @@
-var del = require('del');
-
-module.exports = function (gulp, plugins, config) {
-    return function () {
-        del.sync('source/assets/{css,fonts,js}');
-        del.sync('output_*/assets/{css,fonts,js}');
-    }
-}

gulp-tasks/fonts.js

@@ -1,6 +0,0 @@
-module.exports = function (gulp, plugins, config) {
-    return function () {
-        return gulp.src('node_modules/font-awesome/fonts/*')
-            .pipe(gulp.dest(config.fonts.outputDir));
-    }
-}

gulp-tasks/scripts.js

@@ -1,11 +0,0 @@
-module.exports = function (gulp, plugins, config, sourceFiles, outputFile) {
-    return function () {
-        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-tasks/styles.js

@@ -1,16 +0,0 @@
-module.exports = function (gulp, plugins, config, sourceFiles, outputFile) {
-    return function () {
-        return gulp.src(sourceFiles)
-            .pipe(plugins.plumber())
-            .pipe(plugins.if(!config.production, plugins.sourcemaps.init()))
-            .pipe(plugins.sassGlob())
-            .pipe(plugins.sass())
-            .pipe(plugins.autoprefixer(config.sass.autoprefixer))
-            .pipe(plugins.concat(outputFile))
-            .pipe(plugins.if(config.production, plugins.purifycss(config.sass.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.sass.outputDir));
-    }
-}

gulp-tasks/watch.js

@@ -1,8 +0,0 @@
-module.exports = function (gulp, plugins, config) {
-    return function () {
-        plugins.refresh.listen();
-
-        gulp.watch(config.sass.sourceDir + config.sass.pattern, ['styles']);
-        gulp.watch(config.js.sourceDir + config.js.pattern, ['scripts']);
-    }
-}

gulpfile.js

@@ -3,38 +3,86 @@
 var gulp = require('gulp');
 var plugins = require('gulp-load-plugins')();
 var config = require('./gulpfile.config')(plugins);
+var del = require('del');
 
-function getTask(task) {
+var app = {};
-    return require('./gulp-tasks/' + task)(gulp, plugins, config);
-}
 
-function addStyle(sourceFiles, outputFile) {
+app.copy = function (sourceFiles, destination) {
-    return require('./gulp-tasks/styles')(gulp, plugins, config, sourceFiles, outputFile);
+    return gulp.src(sourceFiles)
-}
+        .pipe(gulp.dest(destination));
+};
 
-function addScript(sourceFiles, outputFile) {
+app.sass = function (sourceFiles, outputFile) {
-    return require('./gulp-tasks/scripts')(gulp, plugins, config, sourceFiles, outputFile);
+    return gulp.src(sourceFiles)
-}
+        .pipe(plugins.plumber())
+        .pipe(plugins.if(!config.production, plugins.sourcemaps.init()))
+        .pipe(plugins.sassGlob())
+        .pipe(plugins.sass())
+        .pipe(plugins.autoprefixer(config.sass.autoprefixer))
+        .pipe(plugins.concat(outputFile))
+        .pipe(plugins.if(config.production, plugins.purifycss(config.sass.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.sass.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('clean', getTask('clean'));
 gulp.task('default', ['clean', 'fonts', 'styles', 'scripts']);
-gulp.task('fonts', getTask('fonts'));
 
-gulp.task('styles',
+gulp.task('fonts', function () {
-    addStyle([
+    return app.copy('node_modules/font-awesome/fonts/*', config.fonts.outputDir);
+});
+
+gulp.task('styles', function () {
+    app.sass([
         'node_modules/font-awesome/css/font-awesome.css',
-        'node_modules/prismjs/themes/prism-twilight.css',
         config.sass.sourceDir + '/main.sass'
-    ], 'site.css')
+    ], 'main.css');
-);
 
-gulp.task('scripts',
+    app.sass([
-    addScript([
+        'node_modules/prismjs/themes/prism-twilight.css',
+        config.sass.sourceDir + '/post.sass'
+    ], 'post.css')
+
+    app.sass(config.sass.sourceDir + '/about.sass', 'about.css');
+    app.sass(config.sass.sourceDir + '/blog.sass', 'blog.css');
+    app.sass(config.sass.sourceDir + '/experience.sass', 'experience.css');
+    app.sass(config.sass.sourceDir + '/project.sass', 'project.css');
+    app.sass(config.sass.sourceDir + '/talk.sass', 'talk.css');
+    app.sass(config.sass.sourceDir + '/testimonials.sass', 'testimonials.css');
+});
+
+gulp.task('scripts', function () {
+    app.js([
+        'node_modules/jquery/dist/jquery.js',
+        config.js.sourceDir + '/**/*.js'
+    ], 'main.js')
+
+    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'
+    ], 'post.js')
-    ], 'site.js')
+});
-);
 
-gulp.task('watch', ['default'], getTask('watch'));
+gulp.task('watch', ['default'], function () {
+    plugins.refresh.listen();
+
+    gulp.watch(config.sass.sourceDir + config.sass.pattern, ['styles']);
+    gulp.watch(config.js.sourceDir + config.js.pattern, ['scripts']);
+});

source/_layouts/default.html.twig

@@ -13,7 +13,7 @@
 
         {% include 'og' with { og: page.meta.og } %}
 
-        <link rel="stylesheet" href="{{ site.url }}/assets/css/site.css">
+        <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
         {% block stylesheets '' %}
 
         {% for size in site.apple_touch_icon_sizes %}
@@ -60,7 +60,7 @@
             </footer>
         </section>
 
-        <script src="{{ site.url }}/assets/js/site.js"></script>
+        <script src="{{ site.url }}/assets/js/main.js"></script>
 
         {% if site.google_analytics_tracking_id %}
             <script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', '{{ site.google_analytics_tracking_id }}', 'auto'); ga('send', 'pageview');</script>

source/_layouts/post.html.twig

@@ -10,3 +10,11 @@
     {% include 'post/pager' %}
     {% include 'post/about-author' %}
 {% endblock %}
+
+{% block stylesheets %}
+    <link rel="stylesheet" href="{{ site.url }}/assets/css/post.css">
+{% endblock %}
+
+{% block scripts %}
+    <script src="{{ site.url }}/assets/js/post.js"></script>
+{% endblock %}

source/_layouts/project.html.twig

@@ -11,3 +11,7 @@
     {% include 'project/skills' %}
     {% include 'project/company' %}
 {% endblock %}
+
+{% block stylesheets %}
+    <link rel="stylesheet" href="{{ site.url }}/assets/css/project.css">
+{% endblock %}

source/_layouts/talk.html.twig

@@ -46,3 +46,7 @@
         } %}
     </div>
 {% endblock %}
+
+{% block stylesheets %}
+    <link rel="stylesheet" href="{{ site.url }}/assets/css/talk.css">
+{% endblock %}

source/blog.html

@@ -43,3 +43,7 @@ use: [posts]
 {% endblock %}
 
 {% block body_classes 'page--blog page--blog__list' %}
+
+{% block stylesheets %}
+    <link rel="stylesheet" href="{{ site.url }}/assets/css/blog.css">
+{% endblock %}

source/experience.html.twig

@@ -47,3 +47,7 @@ redirect:
         </div>
     {% endfor %}
 {% endblock %}
+
+{% block stylesheets %}
+    <link rel="stylesheet" href="{{ site.url }}/assets/css/experience.css">
+{% endblock %}

source/index.md

@@ -49,6 +49,11 @@ I’m a webmaster and documentation maintainer for [Drupal.org][42], and a provi
 - IRC (freenode) - {{ site.irc.name }}
 {% endblock %}
 
+{% block stylesheets %}
+<link rel="stylesheet" href="{{ site.url }}/assets/css/about.css">
+{% endblock %}
+
+
 [1]: https://www.google.com/#q=opdavies
 [2]: https://www.drupal.org
 [3]: http://symfony.com

source/testimonials.html.twig

@@ -30,3 +30,7 @@ use: [posts]
 {% endblock %}
 
 {% block body_classes 'page--testimonials' %}
+
+{% block stylesheets %}
+    <link rel="stylesheet" href="{{ site.url }}/assets/css/testimonials.css">
+{% endblock %}