diff --git a/source/code/hippie/app.js b/source/code/hippie/app.js
index 89af792..60eeeef 100644
--- a/source/code/hippie/app.js
+++ b/source/code/hippie/app.js
@@ -657,10 +657,6 @@ 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 a66010a..80a0dee 160000
--- a/source/style/hippie-style
+++ b/source/style/hippie-style
@@ -1 +1 @@
-Subproject commit a66010a9ed535ad8ca5bbb7faed222861fc40ad4
+Subproject commit 80a0deedd5ec1858c2f9f201412da282462c3a99
diff --git a/source/style/modules/game/_tfw.scss b/source/style/modules/game/_tfw.scss
index 81f9312..4960713 100644
--- a/source/style/modules/game/_tfw.scss
+++ b/source/style/modules/game/_tfw.scss
@@ -30,8 +30,7 @@
font-weight: bold;
}
- .subtle,
- hgroup p {
+ .subtle {
@extend .txt_smaller;
color: hippie.$color_darkest;
@@ -46,13 +45,10 @@
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 {
@@ -90,23 +86,11 @@
gap: hippie.$space_double;
min-height: 0;
- 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:last-child {
+ flex: 2;
}
- & > div {
+ & > div:nth-child(2) {
flex: 4;
display: flex;
flex-flow: column nowrap;
@@ -124,15 +108,19 @@
}
}
- aside {
- flex: 2;
+ nav {
+ flex: 1;
+ display: flex;
+ flex-flow: column nowrap;
+ gap: hippie.$space_basic;
+ min-height: 0;
- .background {
- border-bottom: 1px solid hippie.basic_color(echo);
+ input:not([type="checkbox"], [type="range"]) {
+ @extend .input_io;
}
- & > div {
- display: none;
+ select {
+ @extend .io_select;
}
}
@@ -146,6 +134,7 @@
}
td {
+ height: 4em;
vertical-align: top;
span {
@@ -154,24 +143,12 @@
color: white;
}
- &.subtle {
+ &:last-child {
text-align: center;
vertical-align: middle;
}
}
- questSelection {
- display: none;
- }
-
- &[data-type="faction"] td {
- height: 6em;
- }
-
- &[data-type="quest"] td {
- height: 4em;
- }
-
.l {
width: 30%;
}
@@ -180,11 +157,7 @@
width: 50%;
}
- .g {
- width: 40%;
- }
-
- .t, .s, .c, .f {
+ .t, .s {
width: 20%;
}
}
@@ -200,6 +173,10 @@
}
}
+ .quest {
+ opacity: 0;
+ }
+
footer *:not(button[data-action="back"]) {
display: none;
}
diff --git a/source/view/demo/art/squares2.liquid b/source/view/demo/art/squares2.liquid
deleted file mode 100644
index 1383fad..0000000
--- a/source/view/demo/art/squares2.liquid
+++ /dev/null
@@ -1,178 +0,0 @@
----
-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 e32b6cc..d607592 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.
-
+
Der Inhalt wird dann mit
diff --git a/source/view/demo/components.liquid b/source/view/demo/components.liquid
index 52ce6c3..98f582c 100644
--- a/source/view/demo/components.liquid
+++ b/source/view/demo/components.liquid
@@ -65,7 +65,7 @@ order: 3
Fließt um andere Inhalte. Klassen zur Positionierung und Kombination mit .bside.
aside.right+div.bside
- Seitenbereich, rechts ausgerichtet.
+ Seitenbereich, recht ausgerichtet.
Hauptbereich
<h*>
diff --git a/source/view/demo/art/10print.liquid b/source/view/demo/examples/10print.liquid
similarity index 98%
rename from source/view/demo/art/10print.liquid
rename to source/view/demo/examples/10print.liquid
index 761218c..8ed878e 100644
--- a/source/view/demo/art/10print.liquid
+++ b/source/view/demo/examples/10print.liquid
@@ -1,7 +1,7 @@
---
title: 10print
tags:
-- demoArt
+- demoExample
---
{% layout 'hippie/simple.liquid' %}
diff --git a/source/view/demo/examples/game/tfw.liquid b/source/view/demo/examples/game/tfw.liquid
index 991a933..ab44818 100644
--- a/source/view/demo/examples/game/tfw.liquid
+++ b/source/view/demo/examples/game/tfw.liquid
@@ -38,45 +38,7 @@ tags:
-
-
-
-
-
-
-
-
- Giver
- Category
- Faction
- Status
-
-
-
- Scavengers
-
- All
- Scav
- Open
-
-
-
- Eastern Consulate
-
- All
- Eurasia
- Closed
-
-
-
- СПЕЦНАЗ Commission
-
- All
- Euruska
- Open
-
-
-
+
-
+
@@ -130,21 +92,7 @@ tags:
-
-
-
-
- Western Embassy
- Europa
-
-
-
A hijacked medium mech dubbed the "Rat King" ...
-
-
Collect Rat King residue.
-
-
Multiple rig container upgrades, 5000 CR, 5000 XP, 2 days of water, + Scav faction
- rating
-
+
King Of Kings
@@ -156,7 +104,7 @@ tags:
Multiple rig container upgrades, 5000 CR, 5000 XP, 2 days of water, + Scav faction
rating
-
+
Back
@@ -259,10 +207,8 @@ tags:
// TODO: Allgemeinere Umsetzung anstreben
viewQuest.addEventListener('click', (event) => {
- const tableTarget = event.target.closest('table');
const rows = viewQuest.querySelectorAll('tr');
const rowTarget = event.target.closest('tr');
- const rowFaction = event.target.closest('#factionSelection tr');
const rowSelection = event.target.closest('#questSelection tr');
const rowActive = event.target.closest('#questActive tr:not(.complete)');
const rowComplete = event.target.closest('#questActive tr.complete');
@@ -272,26 +218,14 @@ tags:
if (event.button !== 0) return;
+ // TODO: Ziele unterscheiden
if (rowTarget) {
- const rowsRemain = Array.from(rows).filter(
- element => element !== rowTarget
- );
- const type = tableTarget.dataset.type;
- const tableSibling = tableTarget.nextElementSibling;
-
- rowsRemain.forEach((element) => {
- element.classList.remove('active');
- });
+ for (const row of rows) {
+ row.classList.remove('active');
+ }
rowTarget.classList.add('active');
-
- viewQuest.querySelector('aside > :not(.' + type + ')').style.display = 'none';
- viewQuest.querySelector('aside > .' + type).style.display = 'block';
-
- if (rowFaction) {
- tableTarget.style.display = 'none';
- tableSibling.style.display = 'table';
- }
+ viewQuest.querySelector('.quest').style.opacity = 1;
if (rowSelection) {
buttonClaim.style.display = 'none';
@@ -310,8 +244,6 @@ tags:
buttonAbandon.style.display = 'none';
buttonClaim.style.display = 'inline-block';
}
- } else {
- deselector('quest');
}
});
@@ -329,23 +261,5 @@ tags:
});
new Menu(menu);
-
- function deselector(type) {
- const id = 'view' + capitalizeFirstLetter(type);
- const view = document.getElementById(id);
- const rows = view.querySelectorAll('tr');
- const buttonAccept = view.querySelector('footer button[data-action=accept]');
- const buttonAbandon = view.querySelector('footer button[data-action=abandon]');
- const buttonClaim = view.querySelector('footer button[data-action=claim]');
-
- for (const row of rows) {
- row.classList.remove('active');
- }
-
- view.querySelector('.' + type).style.opacity = 0;
- buttonAbandon.style.display = 'none';
- buttonAccept.style.display = 'none';
- buttonClaim.style.display = 'none';
- }
{% endblock %}
\ No newline at end of file
diff --git a/source/view/demo/art/matrix.liquid b/source/view/demo/examples/matrix.liquid
similarity index 99%
rename from source/view/demo/art/matrix.liquid
rename to source/view/demo/examples/matrix.liquid
index 2078d39..3eb62e9 100644
--- a/source/view/demo/art/matrix.liquid
+++ b/source/view/demo/examples/matrix.liquid
@@ -1,7 +1,7 @@
---
title: Matrix
tags:
-- demoArt
+- demoExample
---
{% layout 'hippie/simple.liquid' %}
diff --git a/source/view/demo/index.liquid b/source/view/demo/index.liquid
index 4ec424f..7159acf 100644
--- a/source/view/demo/index.liquid
+++ b/source/view/demo/index.liquid
@@ -64,17 +64,6 @@ title: Index
{% endfor %}
-
- Art
-
- {% assign artByTitle = collections.demoArt | sort: 'data.title' %}
- {% for link in artByTitle %}
-
- {{ link.data.title }}
-
- {% endfor %}
-
-