From 6775ea07126af3dd321e1832ec56ea69ec90c376 Mon Sep 17 00:00:00 2001 From: Stephan Date: Sat, 23 Mar 2019 14:56:48 +0100 Subject: [PATCH] Addition to user file handling Enabled usage of predeterminded javascript user files. Added `variables.js`, `functions.js` and `globals.js` to build queue. Therefore added option for emtpy single globs. Changed some sass for better modular usage. --- gulpfile.js | 9 +- source/screens/demo.njk | 2 +- source/screens/demo/blank.njk | 2 +- source/screens/demo/examples.njk | 2 +- source/screens/demo/maintenance.njk | 2 +- source/screens/demo/os.njk | 2 +- source/screens/demo/tests.njk | 2 +- source/style/hippie/global/_common.scss | 22 ++- .../hippie/modules/card/_card_module.scss | 176 ++++++++---------- .../style/hippie/modules/card/_extends.scss | 0 source/style/hippie/modules/card/_mixins.scss | 0 11 files changed, 106 insertions(+), 113 deletions(-) delete mode 100644 source/style/hippie/modules/card/_extends.scss delete mode 100644 source/style/hippie/modules/card/_mixins.scss diff --git a/gulpfile.js b/gulpfile.js index cba8a96..519a074 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -44,7 +44,7 @@ const input = { templates: 'source/templates', data: 'source/data/**/*.json', style: 'source/style/**/*.s+(a|c)ss', - code: ['source/code/hippie/variables.js', 'source/code/hippie/functions.js', 'source/code/hippie/global.js', '!source/vendor/**/*'], + code: ['source/code/hippie/variables.js', 'source/code/hippie/functions.js', 'source/code/hippie/global.js', 'source/code/variables.js', 'source/code/functions.js', 'source/code/global.js', 'source/code/**/*.js', '!source/vendor/**/*'], fonts: 'node_modules/@fortawesome/fontawesome-free/webfonts/**/*', art: { favicons: 'source/art/favicons/**/*.+(ico|png)', @@ -175,7 +175,10 @@ function styleLint() { // Javascript for the win function code(cb) { pump([ - src(input.code, { sourcemaps: true }), + src(input.code, { + sourcemaps: true, + allowEmpty: true + }), cache('code'), concat(hippie.jsFile +'.js'), dest(output.code), @@ -189,7 +192,7 @@ function code(cb) { } // Linting function codeLint() { - return src(input.code) + return src(input.code, { allowEmpty: true }) .pipe(plumber()) .pipe(jshint()) .pipe(jshint.reporter('jshint-stylish')) diff --git a/source/screens/demo.njk b/source/screens/demo.njk index 6d30899..5592de0 100644 --- a/source/screens/demo.njk +++ b/source/screens/demo.njk @@ -1,6 +1,6 @@ {% set pageId = "index" %} -{% set pageClass = "height_full" %} +{% set pageClass = "h_full_view" %} {% extends "demo/_default.njk" %} diff --git a/source/screens/demo/blank.njk b/source/screens/demo/blank.njk index 4663a7a..c0e87ea 100644 --- a/source/screens/demo/blank.njk +++ b/source/screens/demo/blank.njk @@ -1,6 +1,6 @@ {% set pageId = "blank" %} -{% set pageClass = "height_full" %} +{% set pageClass = "h_full_view" %} {% extends "demo/_default.njk" %} diff --git a/source/screens/demo/examples.njk b/source/screens/demo/examples.njk index 88daab2..90da2a8 100644 --- a/source/screens/demo/examples.njk +++ b/source/screens/demo/examples.njk @@ -100,7 +100,7 @@
header.header_page>nav.nav_right>ul>(li>a.a_button{Nav $})*4
-
+