diff --git a/gulp/styles.coffee b/gulp/styles.coffee index ff756e2fb..6143b4b6c 100644 --- a/gulp/styles.coffee +++ b/gulp/styles.coffee @@ -1,4 +1,4 @@ g = require 'gulp' g.task 'styles', -> - g.css 'sass/site.scss', 'site.css' + g.css 'styles/site.scss', 'site.css' diff --git a/gulp/vendor.coffee b/gulp/vendor.coffee index 83b9a4b5d..4d7fb8fbe 100644 --- a/gulp/vendor.coffee +++ b/gulp/vendor.coffee @@ -4,7 +4,7 @@ g.task 'vendor', -> g.start 'vendor-styles', 'vendor-scripts' g.task 'vendor-styles', -> g.css [ - 'sass/vendor.scss', + 'styles/vendor.scss', 'vendor/bower/font-awesome/css/font-awesome.css' ], 'vendor.css' diff --git a/gulp/watch.coffee b/gulp/watch.coffee index 30f1cca53..e26168d2b 100644 --- a/gulp/watch.coffee +++ b/gulp/watch.coffee @@ -2,4 +2,4 @@ g = require 'gulp' g.task 'watch', -> g.p.livereload.listen() - g.watch 'sass/**/*.scss', ['styles'] + g.watch 'styles/**/*.scss', ['styles'] diff --git a/sass/_variables.scss b/sass/_variables.scss deleted file mode 100644 index edf8cd791..000000000 --- a/sass/_variables.scss +++ /dev/null @@ -1,5 +0,0 @@ -// Colours. -$dark-gray: #333; - -// Font weights. -$semibold: 500; diff --git a/sass/site.scss b/sass/site.scss deleted file mode 100644 index 7648fcd83..000000000 --- a/sass/site.scss +++ /dev/null @@ -1,14 +0,0 @@ -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/variables'; -@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'; -@import '../vendor/bower/compass-breakpoint/stylesheets/breakpoint'; - -@import '_variables'; - -@import 'partials/base'; -@import 'partials/badges'; -@import 'partials/experience'; -@import 'partials/meetups'; -@import 'partials/footer'; -@import 'partials/testimonials'; -@import 'partials/blog-list'; -@import 'partials/blog-post'; diff --git a/sass/partials/_badges.scss b/styles/_badges.scss similarity index 100% rename from sass/partials/_badges.scss rename to styles/_badges.scss diff --git a/sass/partials/_base.scss b/styles/_base.scss similarity index 100% rename from sass/partials/_base.scss rename to styles/_base.scss diff --git a/sass/partials/_blog-list.scss b/styles/_blog-list.scss similarity index 100% rename from sass/partials/_blog-list.scss rename to styles/_blog-list.scss diff --git a/sass/partials/_blog-post.scss b/styles/_blog-post.scss similarity index 100% rename from sass/partials/_blog-post.scss rename to styles/_blog-post.scss diff --git a/sass/partials/_experience.scss b/styles/_experience.scss similarity index 100% rename from sass/partials/_experience.scss rename to styles/_experience.scss diff --git a/sass/partials/_footer.scss b/styles/_footer.scss similarity index 100% rename from sass/partials/_footer.scss rename to styles/_footer.scss diff --git a/sass/partials/_meetups.scss b/styles/_meetups.scss similarity index 100% rename from sass/partials/_meetups.scss rename to styles/_meetups.scss diff --git a/sass/partials/_testimonials.scss b/styles/_testimonials.scss similarity index 100% rename from sass/partials/_testimonials.scss rename to styles/_testimonials.scss diff --git a/styles/site.scss b/styles/site.scss new file mode 100644 index 000000000..14f73e889 --- /dev/null +++ b/styles/site.scss @@ -0,0 +1,12 @@ +@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/variables'; +@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'; +@import '../vendor/bower/compass-breakpoint/stylesheets/breakpoint'; + +@import 'base'; +@import 'badges'; +@import 'experience'; +@import 'meetups'; +@import 'footer'; +@import 'testimonials'; +@import 'blog-list'; +@import 'blog-post'; diff --git a/sass/vendor.scss b/styles/vendor.scss similarity index 85% rename from sass/vendor.scss rename to styles/vendor.scss index a808a5e7a..d993bda76 100644 --- a/sass/vendor.scss +++ b/styles/vendor.scss @@ -1,4 +1,2 @@ -@import '_variables'; - @import '../vendor/bower/compass-breakpoint/stylesheets/breakpoint'; @import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap';