From 2e2091a179f37eb6df5f900efd2c57ec25d61c75 Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 12 Apr 2025 16:41:47 +0200 Subject: [PATCH 001/253] feat: Add soungbook example - Add songbook to demo - Add macro for song - Add style module --- source/screens/demo/examples/songbook.njk | 51 +++++++++++++++++++ .../demo/examples/songbook/0_artist-title.md | 26 ++++++++++ source/style/demo.scss | 1 + .../modules/songbook/_songbook_module.scss | 20 ++++++++ source/templates/hippie/macros/_song.njk | 12 +++++ 5 files changed, 110 insertions(+) create mode 100755 source/screens/demo/examples/songbook.njk create mode 100755 source/screens/demo/examples/songbook/0_artist-title.md create mode 100755 source/style/modules/songbook/_songbook_module.scss create mode 100644 source/templates/hippie/macros/_song.njk diff --git a/source/screens/demo/examples/songbook.njk b/source/screens/demo/examples/songbook.njk new file mode 100755 index 0000000..0b91499 --- /dev/null +++ b/source/screens/demo/examples/songbook.njk @@ -0,0 +1,51 @@ +--- +title: Songbook +tags: + - demoExample +--- +{% set pageBase = "../" %} +{% set pageId = page.fileSlug %} + +{% extends "demo/_default.njk" %} +{% import "hippie/macros/_placeholder.njk" as ph %} +{% import "hippie/macros/_song.njk" as song %} + +{% block title %}{{ title }}{% endblock %} + +{% block head %} + {{ super() }} +{% endblock %} + +{% block body %} + +
+
+

Titel

+

Jahr

+
+ +

Vorwort

+

Liederbuch für + Name.

+

Gibt es gebunden und hier + {{ ph.link() }}.
+ Bestellungen bitte an + {{ ph.name() }} + richten.

+
+ {%- for piece in collections.song -%} + {{ song.simple(loop.index0, piece.data, piece.content) }} + {%- endfor -%} +
+
{{ ph.name() }}
+
+{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/songbook/0_artist-title.md b/source/screens/demo/examples/songbook/0_artist-title.md new file mode 100755 index 0000000..ccf1b5c --- /dev/null +++ b/source/screens/demo/examples/songbook/0_artist-title.md @@ -0,0 +1,26 @@ +--- +tags: + - songbook + - song +title: "Interpret - Titel" +releaseDate: JJJJ +description: Text +--- +~~~ +[verse 1] +strophe 1 + +[chorus] +refrain + +[verse 2] +strophe 2 + +[chorus] +[bridge] +überleitung + +[interlude] +[chorus] +[outro] +~~~ diff --git a/source/style/demo.scss b/source/style/demo.scss index e46a622..b3d4100 100644 --- a/source/style/demo.scss +++ b/source/style/demo.scss @@ -11,5 +11,6 @@ // ----------------------------------------------------------------------------- @import "modules/card/card_module"; @import "modules/portal/portal_module"; +@import "modules/songbook/songbook_module"; @import "modules/demo/demo_module"; // @import "modules/YOUR-MODULE/YOUR-FILES"; diff --git a/source/style/modules/songbook/_songbook_module.scss b/source/style/modules/songbook/_songbook_module.scss new file mode 100755 index 0000000..321f8bd --- /dev/null +++ b/source/style/modules/songbook/_songbook_module.scss @@ -0,0 +1,20 @@ +.songbook_song { + pre { + @extend .pre_code + } + + header { + h2 { + margin-bottom: $space_basic; + } + + h6 { + color: $color_brightest; + } + + h2+h6 { + margin-top: 0; + margin-bottom: $space_small; + } + } +} \ No newline at end of file diff --git a/source/templates/hippie/macros/_song.njk b/source/templates/hippie/macros/_song.njk new file mode 100644 index 0000000..79083c0 --- /dev/null +++ b/source/templates/hippie/macros/_song.njk @@ -0,0 +1,12 @@ +{% macro simple(index, data, content) %} +
+
+

{{ data.title }}

+
{{ data.releaseDate }}
+

{{ data.description }}

+
+ {#
{{ content }}
#} + {{ content | safe }} +
{{ index }}
+
+{% endmacro %} \ No newline at end of file From 2c61450238d13b88b5997c50517ba3157fe2028f Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 14 Apr 2025 20:16:10 +0200 Subject: [PATCH 002/253] feat: Separate style for drag example --- source/style/modules/ui/_drag_module.scss | 18 ++++++++++++++++++ source/style/modules/ui/_new_module.scss | 22 ++-------------------- source/style/ui.scss | 1 + 3 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 source/style/modules/ui/_drag_module.scss diff --git a/source/style/modules/ui/_drag_module.scss b/source/style/modules/ui/_drag_module.scss new file mode 100644 index 0000000..ac1dc6c --- /dev/null +++ b/source/style/modules/ui/_drag_module.scss @@ -0,0 +1,18 @@ +.body_drag { + height: 100vh; + // padding: $space_basic; +} + +#space { + position: relative; + height: 100%; + background-color: $color-dark; +} + +#addFrame { + @extend .io_button; + position: fixed; + top: 8px; + right: 8px; + margin: 0; +} \ No newline at end of file diff --git a/source/style/modules/ui/_new_module.scss b/source/style/modules/ui/_new_module.scss index 100284b..1c0d5a9 100755 --- a/source/style/modules/ui/_new_module.scss +++ b/source/style/modules/ui/_new_module.scss @@ -5,11 +5,6 @@ $module_top_height: 32px; padding: $module_top_height + $space_basic $space_basic $space_basic; } -.body_drag { - height: 100vh; - // padding: $space_basic; -} - .container { display: grid; height: 100%; @@ -29,7 +24,8 @@ $module_top_height: 32px; } } -.menu, #top { +.menu, +#top { nav ul { margin: 0; } @@ -112,18 +108,4 @@ $module_top_height: 32px; margin-right: 16px; text-align: right; } -} - -#space { - position: relative; - height: 100%; - background-color: $color-dark; -} - -#addFrame { - @extend .io_button; - position: fixed; - top: 8px; - right: 8px; - margin: 0; } \ No newline at end of file diff --git a/source/style/ui.scss b/source/style/ui.scss index 0a36d0d..d088323 100644 --- a/source/style/ui.scss +++ b/source/style/ui.scss @@ -3,3 +3,4 @@ @import "modules/ui/new_module"; @import "modules/ui/settings_module"; +@import "modules/ui/drag_module"; From a43def2e92ee4e6d511c05cfa0890c3f8ebe7e0c Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 14 Apr 2025 20:16:32 +0200 Subject: [PATCH 003/253] feat: New order for meta elements --- source/templates/hippie/partials/_head_meta.njk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/templates/hippie/partials/_head_meta.njk b/source/templates/hippie/partials/_head_meta.njk index 00c2efd..b55c7c2 100644 --- a/source/templates/hippie/partials/_head_meta.njk +++ b/source/templates/hippie/partials/_head_meta.njk @@ -1,7 +1,8 @@ - - - + + + + - + \ No newline at end of file From 58cb0eba2c6ba4ccc10024a4251d1cc054db63af Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 14 Apr 2025 20:50:23 +0200 Subject: [PATCH 004/253] feat: Add sprite folder to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d958f01..5e89ea2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ ################### build/** reports/** +source/art/sprites/ source/art/images/sprite.* # https://gist.github.com/octocat/9257657 From 37986e7b4b5537993bbc4f6343fa9ef097c9107c Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 2 May 2025 14:05:33 +0200 Subject: [PATCH 005/253] feat: Reflect style changes in hippie-style - Update submodule - Rename changed classes --- source/code/hippie/functions.js | 6 +++--- source/style/hippie-style | 2 +- source/templates/hippie/partials/_body_nav.njk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/code/hippie/functions.js b/source/code/hippie/functions.js index 2e80761..602ca13 100644 --- a/source/code/hippie/functions.js +++ b/source/code/hippie/functions.js @@ -33,20 +33,20 @@ function HippieScroll($tp, $dn) { let initLeft = false; const initY = hippie.screen.vh; - $tp.addClass('hide'); + $tp.addClass('di_none'); // Check scroll position and toggle element this.check = function () { hippie.screen.y = Math.min($(document).scrollTop(), document.documentElement.scrollTop); if (hippie.screen.y > initY) { if (!initLeft) { - $tp.removeClass('hide'); + $tp.removeClass('di_none'); console.info('Initial viewport left'); } initLeft = true; } else { if (initLeft) { - $tp.addClass('hide'); + $tp.addClass('di_none'); console.info('Initial viewport entered'); } initLeft = false; diff --git a/source/style/hippie-style b/source/style/hippie-style index 2e100f7..9f3797f 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 2e100f72a90d9b29fdd1a053059631b8644d91dd +Subproject commit 9f3797f6516a63101fb8ebd23ab8229053ec57b6 diff --git a/source/templates/hippie/partials/_body_nav.njk b/source/templates/hippie/partials/_body_nav.njk index f38e940..db7ea52 100644 --- a/source/templates/hippie/partials/_body_nav.njk +++ b/source/templates/hippie/partials/_body_nav.njk @@ -2,7 +2,7 @@
+

Varianten

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

<select>

+ - - + + + {% endblock %} {% block script %} @@ -243,7 +265,7 @@ tags: .visibility = 'hidden'; } } - + function capsDetect() { const body = document.getElementsByTagName('body')[0]; const capsWarning = document.getElementById('error'); diff --git a/source/screens/demo/layouts.njk b/source/screens/demo/layouts.njk index 9672ea8..ab80554 100644 --- a/source/screens/demo/layouts.njk +++ b/source/screens/demo/layouts.njk @@ -15,304 +15,291 @@ tags: {% block main %} -
-
-
-

Sammlung formatierter Elemente

-

Die Elemente werden fortlaufend komplexer

-
-
-

<h3>

-

Beispiele

-
h3.txt_color_dark+p
-

Dunkle Überschrift

-

Mit normalem Textabsatz

-

<h4>

-

Beispiele

-
a>h4
- -

Überschrift als Block-Verweis

-
-

<section>

-
section>div.float_space_left>img^p+p
-
-
Fahne von interaktionsweise
-

Vorname Name
Straße 1, 01234 Stadt

-

+49 (0)123 1337 0000
- name@domain.tld -

-
-
div.space_left_fourth
-
-
-

Eingerückter Inhalt

-
-
-
nav>ul>(li>a.a_button{punkt $})*4nav>ul>(li>a.a_button_border{stufe $})*4
-
- - -
-
nav.nav_horizontal>ul>(li>a.a_button{abschnitt $})*4nav.nav_center_old>ul>(li>a.a_button{typ $})*4
-
+

Tabellen

+
table.table_link>thead>tr>th{&nbsp;}+th{ab / zy}+th{neu / alt}^^(tbody>tr>td.cell_icon[rowspan="2"]>img[width=16  height=16]^+td.cell_link>a[target=_blank]{name}+a[target=_blank]{url}^+td.cell_date[rowspan="2"]{yyy-mm-dd}^tr>td.cell_text>div.shorten{beschreibung})*2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Eingebettet

+
+ + Background flag + + + + + + + + + + +
+ + {% endblock %} {% block script %} From 7950d23b145b4dffe5a11fbc7ea660f3456f919b Mon Sep 17 00:00:00 2001 From: sthag Date: Thu, 19 Jun 2025 14:20:56 +0200 Subject: [PATCH 028/253] feat: More content for components and layouts - Update hippie styles - Add demo images - New components content - New layout structure and content --- source/art/images/demo/bullet.gif | Bin 0 -> 67 bytes source/art/images/demo/letter.gif | Bin 0 -> 77 bytes source/screens/demo/components.njk | 83 ++++++++++++++++++++++++++--- source/screens/demo/layouts.njk | 55 ++++++++++++------- source/style/hippie-style | 2 +- 5 files changed, 112 insertions(+), 28 deletions(-) create mode 100644 source/art/images/demo/bullet.gif create mode 100644 source/art/images/demo/letter.gif diff --git a/source/art/images/demo/bullet.gif b/source/art/images/demo/bullet.gif new file mode 100644 index 0000000000000000000000000000000000000000..55a84abda4f23c8a666c7407220b5d6c3d29b233 GIT binary patch literal 67 zcmZ?wbhEHb6krfwXkcWJmzQT?U{L(Y!pOkD$e;sc1H}ax7?`Ab`d6NQo8K^JQeako VY}IPMlvx!MC0dqgMKLf~0|2-%5Q+c* literal 0 HcmV?d00001 diff --git a/source/art/images/demo/letter.gif b/source/art/images/demo/letter.gif new file mode 100644 index 0000000000000000000000000000000000000000..60aac08875a890ca2123c56ff6c0187c3a02f6ca GIT binary patch literal 77 zcmZ?wbhEHb6krfwXkcW30L7myKqe!D4u}hqVPI0}>0f#JEkEy!En%E@rYNp|)7o`I YR<3>C(^+cLPFXANM1GT&Wo57i0C18ONdN!< literal 0 HcmV?d00001 diff --git a/source/screens/demo/components.njk b/source/screens/demo/components.njk index 87c7a3c..5890112 100644 --- a/source/screens/demo/components.njk +++ b/source/screens/demo/components.njk @@ -80,7 +80,17 @@ tags:
Überschrift 6

Mit Absatz innerhalb von <hgroup>.

+

<header>

+
Kopfbereich
+
header.header_page
+
header.header_txt>h1
+
+

Überschrift 1

+

Innerhalb eines <header>.

+

<footer>

+

Bekommt überlicherweise Klassen zur Positionierung und der Abmessungen zugewiesen.

+
Fußbereich
{{ footer.pinned() }}
@@ -90,24 +100,81 @@ tags:

Elemente:

// p // address // hr // pre // blockquote // ol // ul // li // dl // dt // dd // figure // figcaption // main // div

<p>

+

Ein Absatz. Ein code Element innerhalb wird besonders behandelt.

Varianten

-
p.txt_center
-
p.txt_right
p.column_2
+

Spalten können angegeben werden.

p.column_3.column_line
+

Spalten können angegeben werden.

+

<address>

+
Anschrift, mit bestimmtem, ##### Format.

<hr>

+

Varianten

-
hr.hr_hidden
-
hr.hr_dotted
-
hr.space_even_half
-
hr.hr_dotted.space_even_fourth
+
hr.hr_hidden+hr.hr_dotted+hr.hr_double
+
+
+
+

<pre>

+
Vorformatierter Text.
+	erhält Umbrüche und Einrückung.
+			
+
pre.pre_code>code*2
+
let variable = true;
+()(){}

<blockquote>

-
blockquote>p+p.quote_source
+
Ein Zitat ist eingerückt.
+
blockquote.quote_mark>p+p.quote_source
+
+

Zitat mit automatischen Anführungszeichen

+

und Quellenangabe.

+
+

<dl>, <ol>, <ul>

+
+
Begriff
+
Definition
+
+
    +
  1. Eins
  2. +
  3. Zwei
  4. +
+
    +
  • Obst
  • +
  • Gemüse
  • +
+

Varianten

+
ul.list_basic.list_dash>li*2
+
    +
  • Mehr Abstand und
  • +
  • mit Unterstrichen.
  • +
+
ul.list_link>(li>a)*2
+

<figure>

figure>figcaption+{element}
+
+
Bezeichnung
+ Grafisches Element. +
+

<main>

+
Hauptbereich

<div>

-
div.div_info>p

Varianten

+
div.div_info>p
+
+

Absatz in Informationsbox.

+
+
div.box_space>div.box_cube>span
+
+
Text
+
+
div.box_placeholder+hr+div.box_placeholder_bkg
+
+
+

Tabellen

diff --git a/source/screens/demo/layouts.njk b/source/screens/demo/layouts.njk index ab80554..a45a817 100644 --- a/source/screens/demo/layouts.njk +++ b/source/screens/demo/layouts.njk @@ -21,19 +21,9 @@ tags:

Die Elemente werden fortlaufend komplexer

-

<h3>

-

Beispiele

-
h3.txt_color_dark+p
-

Dunkle Überschrift

-

Mit normalem Textabsatz

-

<h4>

-

Beispiele

-
a>h4
- -

Überschrift als Block-Verweis

-
-

<section>

-
section>div.float_space_left>img^p+p
+

Bereiche

+

section

+
section.overflow>div.float_space_left>img^p+p>br+a.lineLink
Fahne von interaktionsweise

Vorname Name
Straße 1, 01234 Stadt

@@ -41,13 +31,13 @@ tags: name@domain.tld

-
div.space_left_fourth
+
div.space_left_fourth>(hr+p+hr)

Eingerückter Inhalt


-
nav>ul>(li>a.a_button{punkt $})*4nav>ul>(li>a.a_button_border{stufe $})*4
+
div.overflow>(nav.float_space_left>ul>(li>a.a_button{punkt $})*4+nav>ul>(li>a.a_button_border{stufe $})*4)
-
nav.nav_horizontal>ul>(li>a.a_button{abschnitt $})*4nav.nav_center_old>ul>(li>a.a_button{typ $})*4
+
nav.nav_horizontal>ul>(li>a.a_button{abschnitt $})*4
+
div.overflow>nav.nav_center_old>ul>(li>a.a_button{typ $})*4
+

Show me a @@ -229,10 +221,34 @@ tags:

Gruppierung

+

p

+
p.txt_right+p.txt_center+p.txt_left
+

Rechts

+

Mittig

+

Links

+

h*

+
h3.txt_color_dark+p.txt_tiny
+

Dunkle Überschrift

+

Mit winzigem Textabsatz

+
a>h4
+ +

Überschrift als Block-Verweis

+
+

Überschrift 1

+

Kann mehrmals, ohne großen Abstand oberhalb, untereinander stehen.

+

Überschrift 2

+

kann das ebenso.

+ +

hr

+
hr.space_even_half
+
+
hr.hr_dotted.space_even_fourth
+
+

ul

ul.list_link>(li>a>img)*2+li>a