diff --git a/gulpfile.js b/gulpfile.js index bc842ad..ee6ad8f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -113,8 +113,12 @@ gulp.task('nunjucks', function() { // automagically reload browsers gulp.task('syncreload', function() { browsersync.init({ + // online: false, + // watch: true, + // logLevel: "info", open: false, server: 'build', + // index: "demo.html", // proxy: "http://verser.vrt/virtual/" }); }); diff --git a/package-lock.json b/package-lock.json index 33d44ff..0392fb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3696,16 +3696,114 @@ } }, "gulp-sass": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-3.2.1.tgz", - "integrity": "sha512-UATbRpSDsyXCnpYSPBUEvdvtSEzksJs7/oQ0CujIpzKqKrO6vlnYwhX2UTsGrf4rNLwqlSSaM271It0uHYvJ3Q==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.0.1.tgz", + "integrity": "sha512-OMQEgWNggpog8Tc5v1MuI6eo+5iiPkVeLL76iBhDoEEScLUPfZlpvzmgTnLkpcqdrNodZxpz5qcv6mS2rulk3g==", "dev": true, "requires": { - "gulp-util": "3.0.8", + "chalk": "2.4.1", "lodash.clonedeep": "4.5.0", "node-sass": "4.9.0", + "plugin-error": "1.0.1", + "replace-ext": "1.0.0", + "strip-ansi": "4.0.0", "through2": "2.0.3", "vinyl-sourcemaps-apply": "0.2.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + }, + "plugin-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", + "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", + "dev": true, + "requires": { + "ansi-colors": "1.1.0", + "arr-diff": "4.0.0", + "arr-union": "3.1.0", + "extend-shallow": "3.0.2" + } + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } } }, "gulp-sass-lint": { @@ -6075,13 +6173,13 @@ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { - "globule": "1.2.0" + "globule": "1.2.1" } }, "globule": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", - "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", + "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", "dev": true, "requires": { "glob": "7.1.2", diff --git a/package.json b/package.json index 612a412..0bd8e8c 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "gulp-remember": "^0.3.1", "gulp-rename": "^1.2.3", "gulp-ruby-sass": "^2.1.1", - "gulp-sass": "^3.2.1", + "gulp-sass": "^4.0.1", "gulp-sass-lint": "^1.4.0", "gulp-sourcemaps": "^2.6.4", "gulp-uglify": "^3.0.0", diff --git a/source/data.json b/source/data.json index 5c43ee8..5b6c22d 100644 --- a/source/data.json +++ b/source/data.json @@ -21,11 +21,15 @@ "text": "500" } ], - "links": [ + "demoadditionallinks": [ { "href": "blank.html", "text": "Blank" }, + { + "href": "maintenance.html", + "text": "Maintenance" + }, { "href": "tests.html", "text": "Tests" diff --git a/source/pages/index.njk b/source/pages/demo.njk similarity index 92% rename from source/pages/index.njk rename to source/pages/demo.njk index c6cd661..4e96715 100644 --- a/source/pages/index.njk +++ b/source/pages/demo.njk @@ -29,8 +29,8 @@ C(")(")

Overview about all the styles

diff --git a/source/pages/maintenance.njk b/source/pages/maintenance.njk new file mode 100644 index 0000000..f7cd759 --- /dev/null +++ b/source/pages/maintenance.njk @@ -0,0 +1,13 @@ + +{% set pageId = "blank" %} +{% set pageClass = "height_full" %} + +{% extends "maintenance.njk" %} + +{% block title %}Wartung{% endblock %} + +{% block body_content %} +
+

HIPPIE

+
+{% endblock %} diff --git a/source/pages/tests.njk b/source/pages/tests.njk index 39c8021..61ffe44 100644 --- a/source/pages/tests.njk +++ b/source/pages/tests.njk @@ -26,6 +26,9 @@
Caps Lock is ON.
+ +{% import "macros/nav-macro.njk" as forms %} +{{ forms.active('zubereitung') }} {% endblock %} {% block script %} diff --git a/source/style/_new.scss b/source/style/_demo_new.scss similarity index 100% rename from source/style/_new.scss rename to source/style/_demo_new.scss diff --git a/source/style/demo.scss b/source/style/demo.scss index 5da0ada..fa1ab3c 100644 --- a/source/style/demo.scss +++ b/source/style/demo.scss @@ -13,4 +13,4 @@ @import "modules/demo/demo_module"; // @import "modules/YOUR-MODULE/YOUR-FILES"; // New -@import "new"; +@import "demo_new"; diff --git a/source/style/maintenance.scss b/source/style/demo_basic.scss similarity index 96% rename from source/style/maintenance.scss rename to source/style/demo_basic.scss index 320218f..bc2e4b6 100644 --- a/source/style/maintenance.scss +++ b/source/style/demo_basic.scss @@ -13,4 +13,4 @@ @import "modules/demo/demo_module"; // @import "modules/YOUR-MODULE/YOUR-FILES"; // New -@import "new"; +@import "demo_new"; diff --git a/source/style/hippie/elements/_textlevel.scss b/source/style/hippie/elements/_textlevel.scss index 6a3e1c2..d324701 100644 --- a/source/style/hippie/elements/_textlevel.scss +++ b/source/style/hippie/elements/_textlevel.scss @@ -185,6 +185,10 @@ del { font-size: 3em !important; } +.txt_hero { + font-size: $hero_size_1; +} + .txt_center { text-align: center !important; } @@ -202,3 +206,10 @@ del { .txt_black { color: black; } + +.txt_gradient { + background: linear-gradient(165deg, $alpha_color 30%, $bravo_color 45%, $charlie_color 50%, $delta_color, $echo_color 80%, $foxtrot_color); + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} diff --git a/source/style/hippie/global/_config.scss b/source/style/hippie/global/_config.scss index 2215a9d..a0410ab 100644 --- a/source/style/hippie/global/_config.scss +++ b/source/style/hippie/global/_config.scss @@ -52,6 +52,8 @@ $head_size_4: 1.35em !default; $text_size_1: 1em; $text_size_2: 20; +$hero_size_1: $head_size_1 * 3; + $text_line_basic: 1.3 !default; $text_line_mono: 1.1 !default; $head_line_basic: $text_line_basic !default; diff --git a/source/templates/default.njk b/source/templates/default.njk index 076ff87..df8c150 100644 --- a/source/templates/default.njk +++ b/source/templates/default.njk @@ -1,35 +1,35 @@ - - - - - - {% block head %} - {% block title %}{% endblock %} - HIPPIE - - - - - - - - - - - - - - - {% endblock %} - - - - {% block body_content %}{% endblock %} - - {# #} - - {% block script %}{% endblock %} - - + + + + + + {% block head %} + {% block title %}{% endblock %} - HIPPIE + + + + + + + + + + + + + + + {% endblock %} + + + + {% block body_content %}{% endblock %} + + {# #} + + {% block script %}{% endblock %} + + diff --git a/source/templates/demo.njk b/source/templates/demo.njk index a7a15d9..7741e5f 100644 --- a/source/templates/demo.njk +++ b/source/templates/demo.njk @@ -28,7 +28,7 @@ - + {% endblock %} diff --git a/source/templates/maintenance.njk b/source/templates/maintenance.njk index 1604c81..56be958 100644 --- a/source/templates/maintenance.njk +++ b/source/templates/maintenance.njk @@ -17,13 +17,11 @@ - + {% endblock %} -
- {% block body_content %}{% endblock %} -
+ {% block body_content %}{% endblock %}