diff --git a/.gitignore b/.gitignore index 28a10ae8..671b8f1f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /vendor/ .sass-cache/ publish.sh +assets/images/*/* +!assets/images/*/originals diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 0d50eeca..c67d1133 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -110,31 +110,19 @@ meetups: drupalbristol: name: Drupal Bristol logo: drupal-bristol.jpeg - url: http://www.drupalbristol.org.uk + website: http://www.drupalbristol.org.uk + drupalcampbristol: + name: DrupalCamp Bristol + website: http://www.drupalcampbristol.co.uk + logo: drupalcamp-bristol.png swdug: name: SWDUG logo: swdug.png - url: http://swdug.org.uk - nwdug: - name: NWDUG - logo: nwdug.jpg - url: http://www.nwdrupal.org.uk + website: http://swdug.org.uk phpsw: name: PHPSW logo: phpsw.jpeg - url: http://phpsw.uk - phpnw: - name: PHPNW - logo: phpnw.jpg - url: http://phpnw.org.uk - # swlug: - # name: SWLUG - # logo: swlug.png - # url: http://swlug.org.uk - # accbristol: - # name: Accessible Bristol - # logo: accessible-bristol.png - # url: http://www.accessiblebristol.org.uk + website: http://phpsw.uk skills: compass: { title: Compass, image: compass.png } diff --git a/assets/images/meetups/originals/drupalcamp-bristol.png b/assets/images/meetups/originals/drupalcamp-bristol.png new file mode 100644 index 00000000..fed927e8 Binary files /dev/null and b/assets/images/meetups/originals/drupalcamp-bristol.png differ diff --git a/gulpfile.js b/gulpfile.js index 8d729224..0a1049e8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -68,7 +68,8 @@ gulp.task('fonts', function () { gulp.task('meetup-thumbnails', function () { gulp.src(config.assetsDir + '/images/meetups/originals/*') .pipe(plugins.imageResize({ height: 80 })) - .pipe(gulp.dest(config.assetsDir + '/images/meetups/thumbnails')); + .pipe(gulp.dest(config.outputDir + '/images/meetups/thumbnails')) + .pipe(gulp.dest('output_dev/assets/images/meetups/thumbnails')); }); gulp.task('copy-images', function () { diff --git a/source/_includes/meetups.html.twig b/source/_includes/meetups.html.twig index 4e6cc5eb..e845e477 100644 --- a/source/_includes/meetups.html.twig +++ b/source/_includes/meetups.html.twig @@ -1,9 +1,9 @@