From 0986b26acfb533697f2a0cbc5940055235e32651 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 14 Jul 2017 23:10:27 +0100 Subject: [PATCH] Combine stylesheets again --- assets/sass/main.sass | 17 +++++++---------- assets/sass/{about.sass => pages/_about.sass} | 0 assets/sass/{blog.sass => pages/_blog.sass} | 0 .../{experience.sass => pages/_experience.sass} | 0 .../sass/{blog-post.sass => pages/_post.sass} | 0 .../sass/{project.sass => pages/_project.sass} | 0 assets/sass/{talk.sass => pages/_talk.sass} | 0 .../_testimonials.sass} | 0 gulpfile.js | 13 +------------ source/_layouts/post.html.twig | 4 ---- source/_layouts/project.html.twig | 4 ---- source/_layouts/talk.html.twig | 4 ---- source/blog.html | 4 ---- source/experience.html.twig | 4 ---- source/testimonials.html.twig | 4 ---- 15 files changed, 8 insertions(+), 46 deletions(-) rename assets/sass/{about.sass => pages/_about.sass} (100%) rename assets/sass/{blog.sass => pages/_blog.sass} (100%) rename assets/sass/{experience.sass => pages/_experience.sass} (100%) rename assets/sass/{blog-post.sass => pages/_post.sass} (100%) rename assets/sass/{project.sass => pages/_project.sass} (100%) rename assets/sass/{talk.sass => pages/_talk.sass} (100%) rename assets/sass/{testimonials.sass => pages/_testimonials.sass} (100%) diff --git a/assets/sass/main.sass b/assets/sass/main.sass index 2c29c81c..18b1cf14 100644 --- a/assets/sass/main.sass +++ b/assets/sass/main.sass @@ -11,13 +11,10 @@ @import 'components/footer' @import 'components/meetups' -.skills-list - margin: 1em 0 - padding: 0 - -.skill - margin: 0 10px 15px 0 - -.skill-image - height: 40px - width: auto +@import "pages/about" +@import "pages/blog" +@import "pages/experience" +@import "pages/post" +@import "pages/project" +@import "pages/talk" +@import "pages/testimonials" diff --git a/assets/sass/about.sass b/assets/sass/pages/_about.sass similarity index 100% rename from assets/sass/about.sass rename to assets/sass/pages/_about.sass diff --git a/assets/sass/blog.sass b/assets/sass/pages/_blog.sass similarity index 100% rename from assets/sass/blog.sass rename to assets/sass/pages/_blog.sass diff --git a/assets/sass/experience.sass b/assets/sass/pages/_experience.sass similarity index 100% rename from assets/sass/experience.sass rename to assets/sass/pages/_experience.sass diff --git a/assets/sass/blog-post.sass b/assets/sass/pages/_post.sass similarity index 100% rename from assets/sass/blog-post.sass rename to assets/sass/pages/_post.sass diff --git a/assets/sass/project.sass b/assets/sass/pages/_project.sass similarity index 100% rename from assets/sass/project.sass rename to assets/sass/pages/_project.sass diff --git a/assets/sass/talk.sass b/assets/sass/pages/_talk.sass similarity index 100% rename from assets/sass/talk.sass rename to assets/sass/pages/_talk.sass diff --git a/assets/sass/testimonials.sass b/assets/sass/pages/_testimonials.sass similarity index 100% rename from assets/sass/testimonials.sass rename to assets/sass/pages/_testimonials.sass diff --git a/gulpfile.js b/gulpfile.js index d9eb4510..00179c74 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -46,20 +46,9 @@ app.sass = function (sourceFiles, filename) { gulp.task('styles', function () { app.sass([ 'node_modules/font-awesome/css/font-awesome.css', + 'node_modules/prism/themes/prism-twilight.css', config.sass.sourceDir + '/main.sass' ], 'main.css'); - - app.sass(config.sass.sourceDir + '/about.sass', 'about.css'); - app.sass(config.sass.sourceDir + '/blog.sass', 'blog.css'); - app.sass([ - 'node_modules/prism/themes/prism-twilight.css', - config.sass.sourceDir + '/blog-post.sass' - ], 'blog-post.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 + '/talks-table.sass', 'talks-table.css'); - app.sass(config.sass.sourceDir + '/testimonials.sass', 'testimonials.css'); }); gulp.task('scripts', function () { diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig index 57c98f8f..c1e5a9a4 100644 --- a/source/_layouts/post.html.twig +++ b/source/_layouts/post.html.twig @@ -11,7 +11,3 @@ {% include 'post/pager' %} {% include 'post/about-author' %} {% endblock %} - -{% block stylesheets %} - -{% endblock %} diff --git a/source/_layouts/project.html.twig b/source/_layouts/project.html.twig index c7c424ff..87e6a135 100644 --- a/source/_layouts/project.html.twig +++ b/source/_layouts/project.html.twig @@ -11,7 +11,3 @@ {% include 'project/skills' %} {% include 'project/company' %} {% endblock %} - -{% block stylesheets %} - -{% endblock %} diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig index deb49d52..a37d56fc 100644 --- a/source/_layouts/talk.html.twig +++ b/source/_layouts/talk.html.twig @@ -50,7 +50,3 @@ } %} {# .talk-events #} {% endblock %} - -{% block stylesheets %} - -{% endblock %} diff --git a/source/blog.html b/source/blog.html index 48799cbf..04f980d2 100644 --- a/source/blog.html +++ b/source/blog.html @@ -41,7 +41,3 @@ use: [posts] {% endblock %} {% block body_classes 'page--blog page--blog__list' %} - -{% block stylesheets %} - -{% endblock %} diff --git a/source/experience.html.twig b/source/experience.html.twig index a9afc2c3..9bcae488 100644 --- a/source/experience.html.twig +++ b/source/experience.html.twig @@ -47,7 +47,3 @@ redirect: {% endfor %} {% endblock %} - -{% block stylesheets %} - -{% endblock %} diff --git a/source/testimonials.html.twig b/source/testimonials.html.twig index d5d2f864..adab13f1 100644 --- a/source/testimonials.html.twig +++ b/source/testimonials.html.twig @@ -28,7 +28,3 @@ use: [posts] {% endblock %} {% block body_classes 'page--testimonials' %} - -{% block stylesheets %} - -{% endblock %}