diff --git a/source/screens/demo/basics.njk b/source/screens/demo/basics.njk index 2d962aa..3df91dd 100644 --- a/source/screens/demo/basics.njk +++ b/source/screens/demo/basics.njk @@ -15,8 +15,6 @@ tags: {% block main %} - {% include "hippie/partials/_body_nav.njk" %} -
Dies ist einfach nur Text.
Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen.
Das ist normalerweise nicht vorgesehen und wird hier nur zur Einführung und Anschauung verwendet.

@@ -647,6 +645,7 @@ tags: nur lesbar gemacht werden oder mittels disabled gänzlich deaktiviert werden.

+ {# // TODO: Abstände, besonders margin generell überarbeiten #}

@@ -867,27 +866,4 @@ tags:
- -{% endblock %} - -{% block script %} - {{ super() }} - {% endblock %} \ No newline at end of file diff --git a/source/screens/demo/components.njk b/source/screens/demo/components.njk index b4d27f5..443999b 100644 --- a/source/screens/demo/components.njk +++ b/source/screens/demo/components.njk @@ -15,10 +15,6 @@ tags: {% block main %} -
- - {% include "hippie/partials/_body_nav.njk" %} -
@@ -43,10 +39,10 @@ tags:

Übersicht aller Elemente

-

Es werden alle grundlegenden Elemente sowie ihre gestalteten Varianten angegeben. Die Elemente sind in Gruppen eingeteilt, die auch das W3Consortium (www.w3.org/TR/2017/REC-html52-20171214/index.html#contents) verwendet.

+

Es werden alle grundlegenden Elemente sowie ihre gestalteten Varianten angegeben. Die Elemente sind in Gruppen eingeteilt, die auch das W3Consortium (html.spec.whatwg.org/multipage/#toc-semantics) verwendet.

Zu jedem Element werden alle Attribute aufgelistet und die Umsetzung im HTML-Dokument als Emmet-Syntax dargestellt.

-
article>h1+p{Elemente:}+pre+h4{Varianten}
+
article>h1+p{Elemente:}+pre+h2{<tag>}+h4{Varianten}

Bereiche

Elemente:

@@ -94,7 +90,7 @@ tags:

<table>

Varianten

table.width_full.table_fix>(thead>tr>th.cell_pre[scope="col"]+th[scope="col"]*3)+tbody>tr>td.cell_pre+td*3
- +
@@ -182,13 +178,117 @@ tags:
+
+

Formulare

+

Elemente:

+
// form // label // input // button // select // datalist // optgroup // option // textarea // output // progress // meter // fieldset // legend
+

<input>

+
+
+
+
+
+
+
+

Varianten

+
+
+ + + + Caps Lock is ON. +
+
+

<select>

+ +
{% endblock %} {% block script %} {{ super() }} - - {{ log.asset(true) }} - {{ log.log('Assets loaded.', assetsLoaded) }} + {% endblock %} \ No newline at end of file diff --git a/source/screens/demo/index.njk b/source/screens/demo/index.njk index 02b2677..c50c516 100644 --- a/source/screens/demo/index.njk +++ b/source/screens/demo/index.njk @@ -74,12 +74,9 @@ tags: {{ super() }} {% endblock %} \ No newline at end of file diff --git a/source/screens/demo/introduction.njk b/source/screens/demo/introduction.njk index 4fffb89..f1a9752 100644 --- a/source/screens/demo/introduction.njk +++ b/source/screens/demo/introduction.njk @@ -15,8 +15,6 @@ tags: {% block main %} - {% include "hippie/partials/_body_nav.njk" %} -
@@ -41,19 +39,9 @@ tags: logPerf('Assets loaded.', assetsLoaded); // Page specific // ------------------------------------------------------------------------------ - // Create instance of object made by contructor function - var scrollUi = new HippieScroll($('.js_scrolltop'), $('.js_scrolldown')); - var helpUi = new HippieMeta($('.js_showmeta'), $('.js_pop')); + composeMail('special', 'me', 'domain', 'tld', 'Me', 'HIPPIE') + composeMail('.general', 'name', 'domain', 'tld', '', '') - $(document).ready(function () { - logPerf('JQ document ready event fired.'); - composeMail('special', 'me', 'domain', 'tld', 'Me', 'HIPPIE') - composeMail('.general', 'name', 'domain', 'tld', '', '') - }); - - $(document).scroll(function () { - scrollUi.check(); - }); logPerf('Application ready... not.'); {% endblock %} \ No newline at end of file diff --git a/source/screens/demo/layouts.njk b/source/screens/demo/layouts.njk index 810c823..9672ea8 100644 --- a/source/screens/demo/layouts.njk +++ b/source/screens/demo/layouts.njk @@ -15,10 +15,6 @@ tags: {% block main %} -
- - {% include "hippie/partials/_body_nav.njk" %} -
diff --git a/source/templates/hippie/_main.njk b/source/templates/hippie/_main.njk index b7d305a..443b555 100644 --- a/source/templates/hippie/_main.njk +++ b/source/templates/hippie/_main.njk @@ -3,53 +3,67 @@ - - + + - {% block head %} - {{ hippie.titlePrefix }} - {%- block title %}{% endblock %}{{ hippie.titlePostfix }} + {% block head %} + {{ hippie.titlePrefix }} + {%- block title %}{% endblock %}{{ hippie.titlePostfix }} - {% block meta %} - {% include "hippie/partials/_head_meta.njk" %} - {% endblock %} + {% block meta %} + {% include "hippie/partials/_head_meta.njk" %} + {% endblock %} - {% include "hippie/partials/_head_script.njk" %} - {{ log.debug(hippie.debugMode, true) }} - {{ log.start() }} + {% include "hippie/partials/_head_script.njk" %} + {{ log.debug(hippie.debugMode, true) }} + {{ log.start() }} - {% block links %} - {% include "hippie/partials/_head_links.njk" %} - {% endblock %} + {% block links %} + {% include "hippie/partials/_head_links.njk" %} + {% endblock %} - {{ log.log('HEAD end :: Links parsed, starting to load.') }} - {% endblock %} - + {{ log.log('HEAD end :: Links parsed, starting to load.') }} + {% endblock %} + - - {{ log.log('BODY start') }} - {% include "hippie/partials/_body_hover.njk" %} -
- {% include "hippie/partials/_header.njk" %} + + {{ log.log('BODY start') }} + {% include "hippie/partials/_body_hover.njk" %} + {% include "hippie/partials/_body_nav.njk" %} +
+ {% include "hippie/partials/_header.njk" %} -
- {% block main %}{% endblock %} -
+
+ {% block main %}{% endblock %} +
- {% include "hippie/partials/_footer.njk" %} -
+ {% include "hippie/partials/_footer.njk" %} +
- {% block script %} - {{ log.log('BODY :: Loading script assets...') }} - {# #} - - {# // TODO: Remove dependecy to jQuery; at least maek it optional #} - - - - - {% endblock %} + {% block script %} + {{ log.log('BODY :: Loading script assets...') }} + {# #} + + {# // TODO: Remove dependecy to jQuery; at least maek it optional #} + + + + + + {% endblock %} + + {{ log.log('BODY end :: Page script might still be loading.') }} + \ No newline at end of file