diff --git a/.gitignore b/.gitignore index 855925b89..47ab8710b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,6 @@ /node_modules/ /output_*/ -/source/assets/css/ -/source/assets/fonts/ -/source/assets/images/*/thumbnails/ -/source/assets/js/ +/source/assets /.sculpin/ /vendor/ .sass-cache/ diff --git a/assets/fonts/FontAwesome.otf b/assets/fonts/FontAwesome.otf new file mode 100644 index 000000000..3ed7f8b48 Binary files /dev/null and b/assets/fonts/FontAwesome.otf differ diff --git a/assets/fonts/fontawesome-webfont.eot b/assets/fonts/fontawesome-webfont.eot new file mode 100644 index 000000000..9b6afaedc Binary files /dev/null and b/assets/fonts/fontawesome-webfont.eot differ diff --git a/assets/fonts/fontawesome-webfont.svg b/assets/fonts/fontawesome-webfont.svg new file mode 100644 index 000000000..d05688e9e --- /dev/null +++ b/assets/fonts/fontawesome-webfont.svg @@ -0,0 +1,655 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/fonts/fontawesome-webfont.ttf b/assets/fonts/fontawesome-webfont.ttf new file mode 100644 index 000000000..26dea7951 Binary files /dev/null and b/assets/fonts/fontawesome-webfont.ttf differ diff --git a/assets/fonts/fontawesome-webfont.woff b/assets/fonts/fontawesome-webfont.woff new file mode 100644 index 000000000..dc35ce3c2 Binary files /dev/null and b/assets/fonts/fontawesome-webfont.woff differ diff --git a/assets/fonts/fontawesome-webfont.woff2 b/assets/fonts/fontawesome-webfont.woff2 new file mode 100644 index 000000000..500e51725 Binary files /dev/null and b/assets/fonts/fontawesome-webfont.woff2 differ diff --git a/source/assets/images/blog/drupalvm-generate-example-2.gif b/assets/images/blog/drupalvm-generate-example-2.gif similarity index 100% rename from source/assets/images/blog/drupalvm-generate-example-2.gif rename to assets/images/blog/drupalvm-generate-example-2.gif diff --git a/source/assets/images/blog/drupalvm-generate-example.gif b/assets/images/blog/drupalvm-generate-example.gif similarity index 100% rename from source/assets/images/blog/drupalvm-generate-example.gif rename to assets/images/blog/drupalvm-generate-example.gif diff --git a/source/assets/images/blog/drupalvm-generate-release.png b/assets/images/blog/drupalvm-generate-release.png similarity index 100% rename from source/assets/images/blog/drupalvm-generate-release.png rename to assets/images/blog/drupalvm-generate-release.png diff --git a/source/assets/images/blog/drupalvm-generate-repo.png b/assets/images/blog/drupalvm-generate-repo.png similarity index 100% rename from source/assets/images/blog/drupalvm-generate-repo.png rename to assets/images/blog/drupalvm-generate-repo.png diff --git a/source/assets/images/blog/forked-github-repo-commits.png b/assets/images/blog/forked-github-repo-commits.png similarity index 100% rename from source/assets/images/blog/forked-github-repo-commits.png rename to assets/images/blog/forked-github-repo-commits.png diff --git a/source/assets/images/blog/git-format-patch.png b/assets/images/blog/git-format-patch.png similarity index 100% rename from source/assets/images/blog/git-format-patch.png rename to assets/images/blog/git-format-patch.png diff --git a/source/assets/images/blog/github-fork-rebase-phpstorm.png b/assets/images/blog/github-fork-rebase-phpstorm.png similarity index 100% rename from source/assets/images/blog/github-fork-rebase-phpstorm.png rename to assets/images/blog/github-fork-rebase-phpstorm.png diff --git a/source/assets/images/blog/minimum-drupal-version-d7.png b/assets/images/blog/minimum-drupal-version-d7.png similarity index 100% rename from source/assets/images/blog/minimum-drupal-version-d7.png rename to assets/images/blog/minimum-drupal-version-d7.png diff --git a/source/assets/images/blog/my-commit-to-the-rebased-branch.png b/assets/images/blog/my-commit-to-the-rebased-branch.png similarity index 100% rename from source/assets/images/blog/my-commit-to-the-rebased-branch.png rename to assets/images/blog/my-commit-to-the-rebased-branch.png diff --git a/source/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png b/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png similarity index 100% rename from source/assets/images/blog/oliverdavies-uk-jenkins-git-poll.png rename to assets/images/blog/oliverdavies-uk-jenkins-git-poll.png diff --git a/source/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png b/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png similarity index 100% rename from source/assets/images/blog/oliverdavies-uk-jenkins-git-repo.png rename to assets/images/blog/oliverdavies-uk-jenkins-git-repo.png diff --git a/source/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png b/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png similarity index 100% rename from source/assets/images/blog/oliverdavies-uk-jenkins-git-timer.png rename to assets/images/blog/oliverdavies-uk-jenkins-git-timer.png diff --git a/source/assets/images/blog/oliverdavies-uk-jenkins-shell.png b/assets/images/blog/oliverdavies-uk-jenkins-shell.png similarity index 100% rename from source/assets/images/blog/oliverdavies-uk-jenkins-shell.png rename to assets/images/blog/oliverdavies-uk-jenkins-shell.png diff --git a/assets/images/da-individual-member.png b/assets/images/da-individual-member.png new file mode 100644 index 000000000..02b65ca9a Binary files /dev/null and b/assets/images/da-individual-member.png differ diff --git a/assets/images/drupal-8.jpg b/assets/images/drupal-8.jpg new file mode 100644 index 000000000..308ca012e Binary files /dev/null and b/assets/images/drupal-8.jpg differ diff --git a/assets/images/drupal-association-become-member.png b/assets/images/drupal-association-become-member.png new file mode 100644 index 000000000..ecde6d799 Binary files /dev/null and b/assets/images/drupal-association-become-member.png differ diff --git a/assets/images/drupalcon-barcelona.png b/assets/images/drupalcon-barcelona.png new file mode 100644 index 000000000..64552af91 Binary files /dev/null and b/assets/images/drupalcon-barcelona.png differ diff --git a/assets/images/drupalcon-la-attending.png b/assets/images/drupalcon-la-attending.png new file mode 100644 index 000000000..87ed669b4 Binary files /dev/null and b/assets/images/drupalcon-la-attending.png differ diff --git a/assets/images/drupalcon-la-sprinter.png b/assets/images/drupalcon-la-sprinter.png new file mode 100644 index 000000000..b0f1dd0ac Binary files /dev/null and b/assets/images/drupalcon-la-sprinter.png differ diff --git a/assets/images/experience/cti-digital.png b/assets/images/experience/cti-digital.png new file mode 100644 index 000000000..4bd597033 Binary files /dev/null and b/assets/images/experience/cti-digital.png differ diff --git a/source/assets/images/experience/drupal-association.png b/assets/images/experience/drupal-association.png similarity index 100% rename from source/assets/images/experience/drupal-association.png rename to assets/images/experience/drupal-association.png diff --git a/source/assets/images/experience/horse-and-country.jpg b/assets/images/experience/horse-and-country.jpg similarity index 100% rename from source/assets/images/experience/horse-and-country.jpg rename to assets/images/experience/horse-and-country.jpg diff --git a/source/assets/images/experience/lab-class.png b/assets/images/experience/lab-class.png similarity index 100% rename from source/assets/images/experience/lab-class.png rename to assets/images/experience/lab-class.png diff --git a/source/assets/images/experience/microserve.png b/assets/images/experience/microserve.png similarity index 100% rename from source/assets/images/experience/microserve.png rename to assets/images/experience/microserve.png diff --git a/source/assets/images/experience/nomensa.png b/assets/images/experience/nomensa.png similarity index 100% rename from source/assets/images/experience/nomensa.png rename to assets/images/experience/nomensa.png diff --git a/source/assets/images/experience/precedent.jpg b/assets/images/experience/precedent.jpg similarity index 100% rename from source/assets/images/experience/precedent.jpg rename to assets/images/experience/precedent.jpg diff --git a/source/assets/images/experience/proctors.jpg b/assets/images/experience/proctors.jpg similarity index 100% rename from source/assets/images/experience/proctors.jpg rename to assets/images/experience/proctors.jpg diff --git a/assets/images/me-precedent.jpg b/assets/images/me-precedent.jpg new file mode 100644 index 000000000..258e79f5e Binary files /dev/null and b/assets/images/me-precedent.jpg differ diff --git a/source/assets/images/meetups/originals/accessible-bristol.png b/assets/images/meetups/originals/accessible-bristol.png similarity index 100% rename from source/assets/images/meetups/originals/accessible-bristol.png rename to assets/images/meetups/originals/accessible-bristol.png diff --git a/source/assets/images/meetups/originals/drupal-bristol.jpeg b/assets/images/meetups/originals/drupal-bristol.jpeg similarity index 100% rename from source/assets/images/meetups/originals/drupal-bristol.jpeg rename to assets/images/meetups/originals/drupal-bristol.jpeg diff --git a/source/assets/images/meetups/originals/nwdug.jpg b/assets/images/meetups/originals/nwdug.jpg similarity index 100% rename from source/assets/images/meetups/originals/nwdug.jpg rename to assets/images/meetups/originals/nwdug.jpg diff --git a/source/assets/images/meetups/originals/phpnw.gif b/assets/images/meetups/originals/phpnw.gif similarity index 100% rename from source/assets/images/meetups/originals/phpnw.gif rename to assets/images/meetups/originals/phpnw.gif diff --git a/source/assets/images/meetups/originals/phpsw.jpeg b/assets/images/meetups/originals/phpsw.jpeg similarity index 100% rename from source/assets/images/meetups/originals/phpsw.jpeg rename to assets/images/meetups/originals/phpsw.jpeg diff --git a/source/assets/images/meetups/originals/swdug.png b/assets/images/meetups/originals/swdug.png similarity index 100% rename from source/assets/images/meetups/originals/swdug.png rename to assets/images/meetups/originals/swdug.png diff --git a/source/assets/images/meetups/originals/swlug.png b/assets/images/meetups/originals/swlug.png similarity index 100% rename from source/assets/images/meetups/originals/swlug.png rename to assets/images/meetups/originals/swlug.png diff --git a/source/assets/images/meetups/originals/unified-diff.png b/assets/images/meetups/originals/unified-diff.png similarity index 100% rename from source/assets/images/meetups/originals/unified-diff.png rename to assets/images/meetups/originals/unified-diff.png diff --git a/assets/images/meetups/thumbnails/accessible-bristol.png b/assets/images/meetups/thumbnails/accessible-bristol.png new file mode 100644 index 000000000..7f6bc2ff6 Binary files /dev/null and b/assets/images/meetups/thumbnails/accessible-bristol.png differ diff --git a/assets/images/meetups/thumbnails/drupal-bristol.jpeg b/assets/images/meetups/thumbnails/drupal-bristol.jpeg new file mode 100644 index 000000000..3adaf0852 Binary files /dev/null and b/assets/images/meetups/thumbnails/drupal-bristol.jpeg differ diff --git a/assets/images/meetups/thumbnails/nwdug.jpg b/assets/images/meetups/thumbnails/nwdug.jpg new file mode 100644 index 000000000..71af354e1 Binary files /dev/null and b/assets/images/meetups/thumbnails/nwdug.jpg differ diff --git a/assets/images/meetups/thumbnails/phpnw.gif b/assets/images/meetups/thumbnails/phpnw.gif new file mode 100644 index 000000000..aea11e3ef Binary files /dev/null and b/assets/images/meetups/thumbnails/phpnw.gif differ diff --git a/assets/images/meetups/thumbnails/phpsw.jpeg b/assets/images/meetups/thumbnails/phpsw.jpeg new file mode 100644 index 000000000..2b05ffc7a Binary files /dev/null and b/assets/images/meetups/thumbnails/phpsw.jpeg differ diff --git a/assets/images/meetups/thumbnails/swdug.png b/assets/images/meetups/thumbnails/swdug.png new file mode 100644 index 000000000..05a0a09a2 Binary files /dev/null and b/assets/images/meetups/thumbnails/swdug.png differ diff --git a/assets/images/meetups/thumbnails/swlug.png b/assets/images/meetups/thumbnails/swlug.png new file mode 100644 index 000000000..048f33507 Binary files /dev/null and b/assets/images/meetups/thumbnails/swlug.png differ diff --git a/assets/images/meetups/thumbnails/unified-diff.png b/assets/images/meetups/thumbnails/unified-diff.png new file mode 100644 index 000000000..bfeaa5433 Binary files /dev/null and b/assets/images/meetups/thumbnails/unified-diff.png differ diff --git a/source/assets/images/projects/accessible-bristol.png b/assets/images/projects/accessible-bristol.png similarity index 100% rename from source/assets/images/projects/accessible-bristol.png rename to assets/images/projects/accessible-bristol.png diff --git a/source/assets/images/projects/aspira.png b/assets/images/projects/aspira.png similarity index 100% rename from source/assets/images/projects/aspira.png rename to assets/images/projects/aspira.png diff --git a/source/assets/images/projects/avon-motorsport.png b/assets/images/projects/avon-motorsport.png similarity index 100% rename from source/assets/images/projects/avon-motorsport.png rename to assets/images/projects/avon-motorsport.png diff --git a/source/assets/images/projects/cattery.png b/assets/images/projects/cattery.png similarity index 100% rename from source/assets/images/projects/cattery.png rename to assets/images/projects/cattery.png diff --git a/source/assets/images/projects/daylight-photo-awards.png b/assets/images/projects/daylight-photo-awards.png similarity index 100% rename from source/assets/images/projects/daylight-photo-awards.png rename to assets/images/projects/daylight-photo-awards.png diff --git a/source/assets/images/projects/digital-theatre-plus.png b/assets/images/projects/digital-theatre-plus.png similarity index 100% rename from source/assets/images/projects/digital-theatre-plus.png rename to assets/images/projects/digital-theatre-plus.png diff --git a/source/assets/images/projects/door-decor-more.png b/assets/images/projects/door-decor-more.png similarity index 100% rename from source/assets/images/projects/door-decor-more.png rename to assets/images/projects/door-decor-more.png diff --git a/source/assets/images/projects/drupalorg.png b/assets/images/projects/drupalorg.png similarity index 100% rename from source/assets/images/projects/drupalorg.png rename to assets/images/projects/drupalorg.png diff --git a/source/assets/images/projects/handc.png b/assets/images/projects/handc.png similarity index 100% rename from source/assets/images/projects/handc.png rename to assets/images/projects/handc.png diff --git a/source/assets/images/projects/hutch-paving.png b/assets/images/projects/hutch-paving.png similarity index 100% rename from source/assets/images/projects/hutch-paving.png rename to assets/images/projects/hutch-paving.png diff --git a/source/assets/images/projects/ifoa.png b/assets/images/projects/ifoa.png similarity index 100% rename from source/assets/images/projects/ifoa.png rename to assets/images/projects/ifoa.png diff --git a/source/assets/images/projects/mfvc.png b/assets/images/projects/mfvc.png similarity index 100% rename from source/assets/images/projects/mfvc.png rename to assets/images/projects/mfvc.png diff --git a/source/assets/images/projects/rathbone-greenbank.png b/assets/images/projects/rathbone-greenbank.png similarity index 100% rename from source/assets/images/projects/rathbone-greenbank.png rename to assets/images/projects/rathbone-greenbank.png diff --git a/source/assets/images/projects/roadcc.png b/assets/images/projects/roadcc.png similarity index 100% rename from source/assets/images/projects/roadcc.png rename to assets/images/projects/roadcc.png diff --git a/source/assets/images/projects/source-for-searches.png b/assets/images/projects/source-for-searches.png similarity index 100% rename from source/assets/images/projects/source-for-searches.png rename to assets/images/projects/source-for-searches.png diff --git a/source/assets/images/projects/vikisports.png b/assets/images/projects/vikisports.png similarity index 100% rename from source/assets/images/projects/vikisports.png rename to assets/images/projects/vikisports.png diff --git a/source/assets/images/projects/wattstvc.png b/assets/images/projects/wattstvc.png similarity index 100% rename from source/assets/images/projects/wattstvc.png rename to assets/images/projects/wattstvc.png diff --git a/source/assets/images/projects/wlsquared.png b/assets/images/projects/wlsquared.png similarity index 100% rename from source/assets/images/projects/wlsquared.png rename to assets/images/projects/wlsquared.png diff --git a/source/assets/images/skills/originals/compass.png b/assets/images/skills/originals/compass.png similarity index 100% rename from source/assets/images/skills/originals/compass.png rename to assets/images/skills/originals/compass.png diff --git a/source/assets/images/skills/originals/composer.png b/assets/images/skills/originals/composer.png similarity index 100% rename from source/assets/images/skills/originals/composer.png rename to assets/images/skills/originals/composer.png diff --git a/source/assets/images/skills/originals/drupal-commerce.png b/assets/images/skills/originals/drupal-commerce.png similarity index 100% rename from source/assets/images/skills/originals/drupal-commerce.png rename to assets/images/skills/originals/drupal-commerce.png diff --git a/source/assets/images/skills/originals/drupal.png b/assets/images/skills/originals/drupal.png similarity index 100% rename from source/assets/images/skills/originals/drupal.png rename to assets/images/skills/originals/drupal.png diff --git a/source/assets/images/skills/originals/druplicon.png b/assets/images/skills/originals/druplicon.png similarity index 100% rename from source/assets/images/skills/originals/druplicon.png rename to assets/images/skills/originals/druplicon.png diff --git a/source/assets/images/skills/originals/git.png b/assets/images/skills/originals/git.png similarity index 100% rename from source/assets/images/skills/originals/git.png rename to assets/images/skills/originals/git.png diff --git a/source/assets/images/skills/originals/jenkins.png b/assets/images/skills/originals/jenkins.png similarity index 100% rename from source/assets/images/skills/originals/jenkins.png rename to assets/images/skills/originals/jenkins.png diff --git a/source/assets/images/skills/originals/less.png b/assets/images/skills/originals/less.png similarity index 100% rename from source/assets/images/skills/originals/less.png rename to assets/images/skills/originals/less.png diff --git a/source/assets/images/skills/originals/php.png b/assets/images/skills/originals/php.png similarity index 100% rename from source/assets/images/skills/originals/php.png rename to assets/images/skills/originals/php.png diff --git a/source/assets/images/skills/originals/sass.png b/assets/images/skills/originals/sass.png similarity index 100% rename from source/assets/images/skills/originals/sass.png rename to assets/images/skills/originals/sass.png diff --git a/source/assets/images/skills/originals/svn.jpg b/assets/images/skills/originals/svn.jpg similarity index 100% rename from source/assets/images/skills/originals/svn.jpg rename to assets/images/skills/originals/svn.jpg diff --git a/source/assets/images/skills/originals/symfony.png b/assets/images/skills/originals/symfony.png similarity index 100% rename from source/assets/images/skills/originals/symfony.png rename to assets/images/skills/originals/symfony.png diff --git a/source/assets/images/talks/dclondon16.png b/assets/images/talks/dclondon16.png similarity index 100% rename from source/assets/images/talks/dclondon16.png rename to assets/images/talks/dclondon16.png diff --git a/source/assets/images/testimonials/brian-healy.png b/assets/images/testimonials/brian-healy.png similarity index 100% rename from source/assets/images/testimonials/brian-healy.png rename to assets/images/testimonials/brian-healy.png diff --git a/source/assets/images/testimonials/chris-jarvis.jpg b/assets/images/testimonials/chris-jarvis.jpg similarity index 100% rename from source/assets/images/testimonials/chris-jarvis.jpg rename to assets/images/testimonials/chris-jarvis.jpg diff --git a/source/assets/images/testimonials/ed-welsby.png b/assets/images/testimonials/ed-welsby.png similarity index 100% rename from source/assets/images/testimonials/ed-welsby.png rename to assets/images/testimonials/ed-welsby.png diff --git a/source/assets/images/testimonials/holly-ross.png b/assets/images/testimonials/holly-ross.png similarity index 100% rename from source/assets/images/testimonials/holly-ross.png rename to assets/images/testimonials/holly-ross.png diff --git a/source/assets/images/testimonials/james-chapman.png b/assets/images/testimonials/james-chapman.png similarity index 100% rename from source/assets/images/testimonials/james-chapman.png rename to assets/images/testimonials/james-chapman.png diff --git a/source/assets/images/testimonials/josh-mitchell.png b/assets/images/testimonials/josh-mitchell.png similarity index 100% rename from source/assets/images/testimonials/josh-mitchell.png rename to assets/images/testimonials/josh-mitchell.png diff --git a/source/assets/images/testimonials/leonie-watson.jpg b/assets/images/testimonials/leonie-watson.jpg similarity index 100% rename from source/assets/images/testimonials/leonie-watson.jpg rename to assets/images/testimonials/leonie-watson.jpg diff --git a/scripts/vendor/gist-embed.js b/assets/js/vendor/gist-embed.js similarity index 100% rename from scripts/vendor/gist-embed.js rename to assets/js/vendor/gist-embed.js diff --git a/scripts/vendor/gist-embed.min.js b/assets/js/vendor/gist-embed.min.js similarity index 100% rename from scripts/vendor/gist-embed.min.js rename to assets/js/vendor/gist-embed.min.js diff --git a/scripts/vendor/github-cards.js b/assets/js/vendor/github-cards.js similarity index 100% rename from scripts/vendor/github-cards.js rename to assets/js/vendor/github-cards.js diff --git a/scripts/vendor/tweets.js b/assets/js/vendor/tweets.js similarity index 100% rename from scripts/vendor/tweets.js rename to assets/js/vendor/tweets.js diff --git a/styles/_base.sass b/assets/sass/_base.sass similarity index 100% rename from styles/_base.sass rename to assets/sass/_base.sass diff --git a/styles/components/_badges.sass b/assets/sass/components/_badges.sass similarity index 100% rename from styles/components/_badges.sass rename to assets/sass/components/_badges.sass diff --git a/styles/components/_footer.sass b/assets/sass/components/_footer.sass similarity index 100% rename from styles/components/_footer.sass rename to assets/sass/components/_footer.sass diff --git a/styles/components/_meetups.sass b/assets/sass/components/_meetups.sass similarity index 100% rename from styles/components/_meetups.sass rename to assets/sass/components/_meetups.sass diff --git a/styles/components/_testimonials.sass b/assets/sass/components/_testimonials.sass similarity index 100% rename from styles/components/_testimonials.sass rename to assets/sass/components/_testimonials.sass diff --git a/styles/components/content-types/_blog-post.sass b/assets/sass/components/content-types/_blog-post.sass similarity index 100% rename from styles/components/content-types/_blog-post.sass rename to assets/sass/components/content-types/_blog-post.sass diff --git a/styles/components/content-types/_talk.sass b/assets/sass/components/content-types/_talk.sass similarity index 100% rename from styles/components/content-types/_talk.sass rename to assets/sass/components/content-types/_talk.sass diff --git a/styles/pages/_blog-list.sass b/assets/sass/pages/_blog-list.sass similarity index 100% rename from styles/pages/_blog-list.sass rename to assets/sass/pages/_blog-list.sass diff --git a/styles/pages/_blog-post.sass b/assets/sass/pages/_blog-post.sass similarity index 100% rename from styles/pages/_blog-post.sass rename to assets/sass/pages/_blog-post.sass diff --git a/styles/pages/_experience.sass b/assets/sass/pages/_experience.sass similarity index 78% rename from styles/pages/_experience.sass rename to assets/sass/pages/_experience.sass index 5db0104ca..6742a1e81 100644 --- a/styles/pages/_experience.sass +++ b/assets/sass/pages/_experience.sass @@ -4,8 +4,8 @@ .experience__logo @extend .pull-right margin: 0 0 10px 10px - max-width: 25% + max-width: 150px - .role-wrapper + .experience__role font-style: italic margin-bottom: 10px diff --git a/styles/pages/_portfolio.sass b/assets/sass/pages/_portfolio.sass similarity index 100% rename from styles/pages/_portfolio.sass rename to assets/sass/pages/_portfolio.sass diff --git a/assets/sass/site.sass b/assets/sass/site.sass new file mode 100644 index 000000000..bfdbe6d58 --- /dev/null +++ b/assets/sass/site.sass @@ -0,0 +1,21 @@ +@import '../../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/variables' +@import '../../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix' +@import '../../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/center-block' +@import '../../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/hide-text' +@import '../../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins' +@import '../../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/tab-focus' +@import '../../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/image' +@import '../../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/utilities' +@import '../../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding' +@import '../../vendor/bower/compass-breakpoint/stylesheets/breakpoint' + +@import 'base' +@import 'components/badges' +@import 'components/content-types/**' +@import 'components/footer' +@import 'components/meetups' +@import 'components/testimonials' +@import 'pages/blog-list' +@import 'pages/blog-post' +@import 'pages/experience' +@import 'pages/portfolio' diff --git a/assets/sass/vendor.sass b/assets/sass/vendor.sass new file mode 100644 index 000000000..7fb47480c --- /dev/null +++ b/assets/sass/vendor.sass @@ -0,0 +1,2 @@ +@import '../../vendor/bower/compass-breakpoint/stylesheets/breakpoint' +@import '../../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap' diff --git a/gulp/build.coffee b/gulp/build.coffee deleted file mode 100644 index 9f7feaa19..000000000 --- a/gulp/build.coffee +++ /dev/null @@ -1,4 +0,0 @@ -g = require 'gulp' - -g.task 'build', ['clean'], -> - g.start 'fonts', 'images', 'styles', 'vendor' diff --git a/gulp/clean.coffee b/gulp/clean.coffee deleted file mode 100644 index 1a2dff31d..000000000 --- a/gulp/clean.coffee +++ /dev/null @@ -1,13 +0,0 @@ -g = require 'gulp' - -g.task 'clean', -> - g.src [ - 'output_*/assets/css', - 'output_*/assets/fonts', - 'output_*/assets/js', - 'source/assets/css', - 'source/assets/fonts', - 'source/assets/images/*/thumbnails', - 'source/assets/js', - ], read: false - .pipe g.p.clean() diff --git a/gulp/default.coffee b/gulp/default.coffee deleted file mode 100644 index 0e10d626c..000000000 --- a/gulp/default.coffee +++ /dev/null @@ -1,4 +0,0 @@ -g = require 'gulp' - -g.task 'default', -> - g.start 'build', 'watch' diff --git a/gulp/fonts.coffee b/gulp/fonts.coffee deleted file mode 100644 index 3c5cc5307..000000000 --- a/gulp/fonts.coffee +++ /dev/null @@ -1,4 +0,0 @@ -g = require 'gulp' - -g.task 'fonts', -> - g.copy('./vendor/bower/font-awesome/fonts/*', './source/assets/fonts') diff --git a/gulp/images.coffee b/gulp/images.coffee deleted file mode 100644 index 5ce4b8636..000000000 --- a/gulp/images.coffee +++ /dev/null @@ -1,14 +0,0 @@ -g = require 'gulp' - -g.task 'images', -> g.start 'meetup-thumbnails', 'minify-images' - -g.task 'meetup-thumbnails', -> - g.src 'source/assets/images/meetups/originals/*' - .pipe g.p.imageResize - height: 50 - .pipe g.dest 'source/assets/images/meetups/thumbnails' - -g.task 'minify-images', -> - g.src 'source/assets/images/*' - .pipe g.p.imagemin() - .pipe g.dest 'source/assets/images' diff --git a/gulp/minify-prod-html.coffee b/gulp/minify-prod-html.coffee deleted file mode 100644 index 3d00f61a4..000000000 --- a/gulp/minify-prod-html.coffee +++ /dev/null @@ -1,6 +0,0 @@ -g = require 'gulp' - -g.task 'minify-prod-html', -> - g.src 'output_prod/**/*.html' - .pipe g.p.htmlmin({ collapseWhitespace: true }) - .pipe g.dest 'output_prod' diff --git a/gulp/scripts.coffee b/gulp/scripts.coffee deleted file mode 100644 index e69de29bb..000000000 diff --git a/gulp/styles.coffee b/gulp/styles.coffee deleted file mode 100644 index d6fe331fb..000000000 --- a/gulp/styles.coffee +++ /dev/null @@ -1,4 +0,0 @@ -g = require 'gulp' - -g.task 'styles', -> - g.css 'styles/site.sass', 'site.css' diff --git a/gulp/vendor.coffee b/gulp/vendor.coffee deleted file mode 100644 index cae83b5b1..000000000 --- a/gulp/vendor.coffee +++ /dev/null @@ -1,18 +0,0 @@ -g = require 'gulp' - -g.task 'vendor', -> g.start 'vendor-styles', 'vendor-scripts' - -g.task 'vendor-styles', -> - g.css [ - 'styles/vendor.sass', - 'vendor/bower/font-awesome/css/font-awesome.css' - ], 'vendor.css' - -g.task 'vendor-scripts', => - g.js [ - 'vendor/bower/jquery/dist/jquery.js', - 'vendor/bower/bootstrap-sass/assets/javascripts/bootstrap/collapse.js', - 'scripts/vendor/gist-embed.js', - 'scripts/vendor/github-cards.js', - 'scripts/vendor/tweets.js' - ], 'vendor.js' diff --git a/gulp/watch.coffee b/gulp/watch.coffee deleted file mode 100644 index 2443fdfe6..000000000 --- a/gulp/watch.coffee +++ /dev/null @@ -1,4 +0,0 @@ -g = require 'gulp' - -g.task 'watch', -> - g.watch 'styles/*.sass', ['styles'] diff --git a/gulpfile.coffee b/gulpfile.coffee deleted file mode 100644 index a38e61039..000000000 --- a/gulpfile.coffee +++ /dev/null @@ -1,36 +0,0 @@ -g = require('gulp') -g.p = require('gulp-load-plugins')() -g.d = require('del') - -g.config = - bowerDir: 'vendor/bower', - assetsDir: './source/assets', - sassPattern: './sass/**/*.scss', - production: !!g.p.util.env.production, - sourceMaps: !g.p.util.env.production, - liveReload: !g.p.util.env.production - -g.copy = (srcFiles, outputDir) -> - g.src srcFiles - .pipe g.dest outputDir - -g.css = (srcFiles, destFile) -> - g.src srcFiles - .pipe g.p.plumber() - .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.init() - .pipe g.p.sass() - .pipe g.p.concat destFile - .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.write('.') - .pipe g.dest 'source/assets/css' - .pipe g.p.if g.config.liveReload, g.p.livereload() - -g.js = (srcFiles, destFile) -> - g.src srcFiles - .pipe g.p.plumber() - .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.init() - .pipe g.p.concat destFile - .pipe g.p.if g.config.production, g.p.uglify() - .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.write('.') - .pipe g.dest 'source/assets/js' - -require('fs').readdirSync('./gulp').forEach (task) -> require "./gulp/#{task}" diff --git a/gulpfile.js b/gulpfile.js index c7f2b8b8a..62fd2eb2e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,2 +1,104 @@ -require('coffee-script/register'); -require('./gulpfile.coffee'); +var gulp = require('gulp'); +var plugins = require('gulp-load-plugins')(); +var del = require('del'); + +var config = { + assetsDir: './assets', + sassPattern: './assets/sass/**/*.sass', + production: !!plugins.util.env.production, + sourceMaps: !plugins.util.env.production, + liveReload: !plugins.util.env.production +}; + +var app = {}; + +app.css = function (paths, filename) { + gulp.src(paths) + .pipe(plugins.plumber()) + .pipe(plugins.if(config.sourceMaps, plugins.sourcemaps.init())) + .pipe(plugins.sourcemaps.init()) + .pipe(plugins.sassGlob()) + .pipe(plugins.sass()) + .pipe(plugins.concat(filename)) + .pipe(config.production ? plugins.cleanCss() : plugins.util.noop()) + .pipe(plugins.if(config.sourceMaps, plugins.sourcemaps.write('.'))) + .pipe(gulp.dest('source/assets/css')) + .pipe(plugins.if(config.liveReload, plugins.livereload())); +}; + +app.js = function (paths, filename) { + gulp.src(paths) + .pipe(plugins.plumber()) + .pipe(plugins.if(config.sourceMaps, plugins.sourcemaps.init())) + .pipe(plugins.sourcemaps.init()) + .pipe(plugins.concat(filename)) + .pipe(config.production ? plugins.uglify() : plugins.util.noop()) + .pipe(plugins.if(config.sourceMaps, plugins.sourcemaps.write('.'))) + .pipe(gulp.dest('source/assets/js')); +}; + +app.copy = function (srcFiles, outputDir) { + gulp.src(srcFiles) + .pipe(gulp.dest(outputDir)); +}; + +gulp.task('styles', function () { + app.css(config.assetsDir + '/sass/site.sass', 'site.css'); +}); + +gulp.task('watch', function () { + gulp.watch(config.sassPattern, ['styles']); + gulp.watch(config.assetsDir + '/js/**/*.js', ['scripts']); +}); + +gulp.task('clean', function () { + del.sync('output_*/assets'); + del.sync('source/assets'); +}); + +gulp.task('vendor-styles', function () { + app.css([ + config.assetsDir + '/sass/vendor.sass', + 'vendor/bower/font-awesome/css/font-awesome.css' + ], 'vendor.css') +}); + +gulp.task('vendor-scripts', function () { + app.js([ + 'vendor/bower/jquery/dist/jquery.js', + 'vendor/bower/bootstrap-sass/assets/javascripts/bootstrap/collapse.js', + 'scripts/vendor/**/*.js' + ], 'vendor.js'); +}); + +gulp.task('vendor', ['vendor-styles', 'vendor-scripts']); + +gulp.task('fonts', function () { + app.copy('./assets/fonts/*', './source/assets/fonts'); +}); + +gulp.task('meetup-thumbnails', function () { + gulp.src(config.assetsDir + '/images/meetups/originals/*') + .pipe(plugins.imageResize({ + height: '50' + })) + .pipe(gulp.dest(config.assetsDir + '/images/meetups/thumbnails')) +}); + +gulp.task('copy-images', function () { + app.copy('./assets/images/**/*', './source/assets/images'); +}); + +gulp.task('images', ['meetup-thumbnails', 'copy-images']); + +gulp.task('build', ['clean', 'vendor', 'styles', 'fonts', 'images']); + +gulp.task('default', ['build', 'watch']); + +gulp.task('minify-prod-html', function () { + gulp.src('output_prod/**/*.html') + .pipe(plugins.htmlmin({ + 'collapseWhitespace': true + })) + .pipe(gulp.dest('output_prod')); +}); diff --git a/package.json b/package.json index 05ed978a7..6e4fc3730 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "del": "^2.2.0", "gulp": "^3.9.0", "gulp-clean": "^0.3.1", + "gulp-clean-css": "^2.0.4", "gulp-concat": "^2.6.0", "gulp-htmlmin": "^1.3.0", "gulp-if": "^2.0.0", @@ -15,8 +16,9 @@ "gulp-minify-css": "^1.2.3", "gulp-plumber": "^1.0.1", "gulp-sass": "^2.1.1", + "gulp-sass-glob": "^1.0.5", "gulp-sourcemaps": "^1.6.0", - "gulp-uglify": "^1.5.1", + "gulp-uglify": "^1.5.3", "gulp-util": "^3.0.7" } } diff --git a/source/assets/images/da-individual-member.png b/source/assets/images/da-individual-member.png index 76a1692cd..02b65ca9a 100644 Binary files a/source/assets/images/da-individual-member.png and b/source/assets/images/da-individual-member.png differ diff --git a/source/assets/images/experience/cti-digital.png b/source/assets/images/experience/cti-digital.png deleted file mode 100644 index 382b676cf..000000000 Binary files a/source/assets/images/experience/cti-digital.png and /dev/null differ diff --git a/styles/site.sass b/styles/site.sass deleted file mode 100644 index de865e6ca..000000000 --- a/styles/site.sass +++ /dev/null @@ -1,22 +0,0 @@ -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/variables' -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix' -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/center-block' -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/hide-text' -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/vendor-prefixes' -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/tab-focus' -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/image' -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/utilities' -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding' -@import '../vendor/bower/compass-breakpoint/stylesheets/breakpoint' - -@import 'base' -@import 'components/badges' -@import 'components/content-types/blog-post' -@import 'components/content-types/talk' -@import 'components/footer' -@import 'components/meetups' -@import 'components/testimonials' -@import 'pages/blog-list' -@import 'pages/blog-post' -@import 'pages/experience' -@import 'pages/portfolio' diff --git a/styles/vendor.sass b/styles/vendor.sass deleted file mode 100644 index 9f487e8ae..000000000 --- a/styles/vendor.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../vendor/bower/compass-breakpoint/stylesheets/breakpoint' -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap'