interaktionsweise/hippie
1
1
Fork 0
Code Issues Pull requests Releases 3 Activity Actions

demo.3

Browse source 
* moved templates to demo structure
* new sass version
* restructure of some styles for demo
This commit is contained in:
Stephan 2018-08-20 22:42:46 +02:00
parent 4708896f79
commit a810ec2770
15 changed files with 187 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gulpfile.js
View file

@ -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/"
});
});

114
package-lock.json generated
View file

@ -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",

2
package.json
View file

@ -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",

6
source/data.json
View file

@ -21,11 +21,15 @@
"text": "500"
}
],
"links": [
"demoadditionallinks": [
{
"href": "blank.html",
"text": "Blank"
},
{
"href": "maintenance.html",
"text": "Maintenance"
},
{
"href": "tests.html",
"text": "Tests"

4
source/pages/index.njk → source/pages/demo.njk
View file

@ -29,8 +29,8 @@
C(")(")</pre>
<h3>Overview about all the styles</h3>
<ul class="list__link">
<!-- Loops through "links" array -->
{% for link in links %}
<!-- Loops through "demoadditionallinks" array -->
{% for link in demoadditionallinks %}
<li><a href="{{link.href}}">{{link.text}}</a></li>
{% endfor %}
</ul>

13
source/pages/maintenance.njk Normal file
View file

@ -0,0 +1,13 @@
<!-- blank.njk -->
{% set pageId = "blank" %}
{% set pageClass = "height_full" %}
{% extends "maintenance.njk" %}
{% block title %}Wartung{% endblock %}
{% block body_content %}
<div id="root" class="overflow">
<h1 class="txt_hero txt_center txt_gradient">HIPPIE</h1>
</div>
{% endblock %}

3
source/pages/tests.njk
View file

@ -26,6 +26,9 @@
<form action="">
<input id="txtName" type="text" /><span id="error">Caps Lock is ON.</span>
</form>
{% import "macros/nav-macro.njk" as forms %}
{{ forms.active('zubereitung') }}
{% endblock %}
{% block script %}

0
source/style/_new.scss → source/style/_demo_new.scss
View file

2
source/style/demo.scss
View file

@ -13,4 +13,4 @@
@import "modules/demo/demo_module";
// @import "modules/YOUR-MODULE/YOUR-FILES";
// New
@import "new";
@import "demo_new";

2
source/style/maintenance.scss → source/style/demo_basic.scss
View file

@ -13,4 +13,4 @@
@import "modules/demo/demo_module";
// @import "modules/YOUR-MODULE/YOUR-FILES";
// New
@import "new";
@import "demo_new";

11
source/style/hippie/elements/_textlevel.scss
View file

@ -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;
}

2
source/style/hippie/global/_config.scss
View file

@ -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;

70
source/templates/default.njk
View file

@ -1,35 +1,35 @@
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8">
{% block head %}
<title>{% block title %}{% endblock %} - HIPPIE</title>
<meta name="author" content="Interaktionsweise">
<meta name="description" content="hippie">
<meta name="generator" content="Notepad++, Atom">
<meta name="robots" content="noindex">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta http-equiv="X-UA-Compatible" content="IE=Edge;chrome=1" />
<link rel="icon" href="./favicon.ico" type="image/vnd.microsoft.icon">
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
<link rel="stylesheet" type="text/css" media="all" href="./css/demo.css"/>
<!-- <link rel="stylesheet" type="text/css" media="print" href="./css/print.css"/> -->
{% endblock %}
</head>
<body id="{{ pageId }}" class="{{ pageClass }}">
{% block body_content %}{% endblock %}
<script
src="https://code.jquery.com/jquery-3.2.1.min.js"
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
crossorigin="anonymous"></script>
{# <script src="bower_components/jquery/dist/jquery.js"></script> #}
<script src="./js/all.min.js" type="text/javascript"></script>
{% block script %}{% endblock %}
</body>
</html>
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8">
{% block head %}
<title>{% block title %}{% endblock %} - HIPPIE</title>
<meta name="author" content="Interaktionsweise">
<meta name="description" content="hippie">
<meta name="generator" content="Notepad++, Atom">
<meta name="robots" content="noindex">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta http-equiv="X-UA-Compatible" content="IE=Edge;chrome=1" />
<link rel="icon" href="./favicon.ico" type="image/vnd.microsoft.icon">
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
<link rel="stylesheet" type="text/css" media="all" href="css/demo.css"/>
<!-- <link rel="stylesheet" type="text/css" media="print" href="./css/print.css"/> -->
{% endblock %}
</head>
<body id="{{ pageId }}" class="{{ pageClass }}">
{% block body_content %}{% endblock %}
<script
src="https://code.jquery.com/jquery-3.2.1.min.js"
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
crossorigin="anonymous"></script>
{# <script src="bower_components/jquery/dist/jquery.js"></script> #}
<script src="./js/all.min.js" type="text/javascript"></script>
{% block script %}{% endblock %}
</body>
</html>

2
source/templates/demo.njk
View file

@ -28,7 +28,7 @@
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
<!-- <link href='https://fonts.googleapis.com/css?family=Roboto:400,300,400italic,500,500italic,700' rel='stylesheet' type='text/css'> -->
<link rel="stylesheet" type="text/css" media="all" href="../css/demo.css"/>
<link rel="stylesheet" type="text/css" media="all" href="css/demo.css"/>
<!-- <link rel="stylesheet" type="text/css" media="print" href="./css/print.css"/> -->
{% endblock %}
</head>

6
source/templates/maintenance.njk
View file

@ -17,13 +17,11 @@
<link rel="icon" href="./favicon.ico" type="image/vnd.microsoft.icon">
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
<link rel="stylesheet" type="text/css" media="all" href="../../css/maintenance.css"/>
<link rel="stylesheet" type="text/css" media="all" href="css/demo_basic.css"/>
{% endblock %}
</head>
<body id="{{ pageId }}" class="{{ pageClass }}">
<div id="root">
{% block body_content %}{% endblock %}
</div>
{% block body_content %}{% endblock %}
</body>
</html>