diff --git a/source/code/hippie/app.js b/source/code/hippie/app.js index 60eeeef..89af792 100644 --- a/source/code/hippie/app.js +++ b/source/code/hippie/app.js @@ -657,6 +657,10 @@ class RandomPixelPlaceholder { } } +function sample(array) { + return array[Math.floor(Math.random() * array.length)]; +} + // CONCEPTS // NOTE: Benutzt private Zuweisungen diff --git a/source/style/hippie-style b/source/style/hippie-style index 80a0dee..a66010a 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 80a0deedd5ec1858c2f9f201412da282462c3a99 +Subproject commit a66010a9ed535ad8ca5bbb7faed222861fc40ad4 diff --git a/source/style/modules/game/_tfw.scss b/source/style/modules/game/_tfw.scss index 4960713..81f9312 100644 --- a/source/style/modules/game/_tfw.scss +++ b/source/style/modules/game/_tfw.scss @@ -30,7 +30,8 @@ font-weight: bold; } - .subtle { + .subtle, + hgroup p { @extend .txt_smaller; color: hippie.$color_darkest; @@ -45,10 +46,13 @@ position: relative; overflow: hidden; + h2, span { + color: white; + } + *:not(canvas, img) { z-index: map.get(hippie.$z-indexes, "content-bottom"); position: relative; - color: white; } canvas, img { @@ -86,11 +90,23 @@ gap: hippie.$space_double; min-height: 0; - & > div:last-child { - flex: 2; + nav { + flex: 1; + display: flex; + flex-flow: column nowrap; + gap: hippie.$space_basic; + min-height: 0; + + input:not([type="checkbox"], [type="range"]) { + @extend .input_io; + } + + select { + @extend .io_select; + } } - & > div:nth-child(2) { + & > div { flex: 4; display: flex; flex-flow: column nowrap; @@ -108,19 +124,15 @@ } } - nav { - flex: 1; - display: flex; - flex-flow: column nowrap; - gap: hippie.$space_basic; - min-height: 0; + aside { + flex: 2; - input:not([type="checkbox"], [type="range"]) { - @extend .input_io; + .background { + border-bottom: 1px solid hippie.basic_color(echo); } - select { - @extend .io_select; + & > div { + display: none; } } @@ -134,7 +146,6 @@ } td { - height: 4em; vertical-align: top; span { @@ -143,12 +154,24 @@ color: white; } - &:last-child { + &.subtle { text-align: center; vertical-align: middle; } } + &#questSelection { + display: none; + } + + &[data-type="faction"] td { + height: 6em; + } + + &[data-type="quest"] td { + height: 4em; + } + .l { width: 30%; } @@ -157,7 +180,11 @@ width: 50%; } - .t, .s { + .g { + width: 40%; + } + + .t, .s, .c, .f { width: 20%; } } @@ -173,10 +200,6 @@ } } - .quest { - opacity: 0; - } - footer *:not(button[data-action="back"]) { display: none; } diff --git a/source/view/demo/examples/10print.liquid b/source/view/demo/art/10print.liquid similarity index 98% rename from source/view/demo/examples/10print.liquid rename to source/view/demo/art/10print.liquid index 8ed878e..761218c 100644 --- a/source/view/demo/examples/10print.liquid +++ b/source/view/demo/art/10print.liquid @@ -1,7 +1,7 @@ --- title: 10print tags: -- demoExample +- demoArt --- {% layout 'hippie/simple.liquid' %} diff --git a/source/view/demo/examples/matrix.liquid b/source/view/demo/art/matrix.liquid similarity index 99% rename from source/view/demo/examples/matrix.liquid rename to source/view/demo/art/matrix.liquid index 3eb62e9..2078d39 100644 --- a/source/view/demo/examples/matrix.liquid +++ b/source/view/demo/art/matrix.liquid @@ -1,7 +1,7 @@ --- title: Matrix tags: -- demoExample +- demoArt --- {% layout 'hippie/simple.liquid' %} diff --git a/source/view/demo/art/squares2.liquid b/source/view/demo/art/squares2.liquid new file mode 100644 index 0000000..1383fad --- /dev/null +++ b/source/view/demo/art/squares2.liquid @@ -0,0 +1,178 @@ +--- +title: Squares² +tags: +- demoArt +--- +{% layout 'hippie/simple.liquid' %} + +{% block style %} + +{% endblock %} + +{% block body %}{% endblock %} + +{% block script %} + +{% endblock %} \ No newline at end of file diff --git a/source/view/demo/basics.liquid b/source/view/demo/basics.liquid index d607592..e32b6cc 100644 --- a/source/view/demo/basics.liquid +++ b/source/view/demo/basics.liquid @@ -561,7 +561,7 @@ order: 2

Änderungen

Werden Texte geändert, können solche Änderungen sichtbar gemacht werden. Somit können sie besser nachvollzogen werden.
Zum Beispiel eine Ergänzung von Inhalt.

-