From 2387e08ad0d86e391b5f7b63971cbf38dcfa9218 Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 21 Mar 2026 17:49:48 +0100 Subject: [PATCH] feat: Combine start and tile screens - Combine start and tile content to start screen - Remove tile screen - Remove new css module - Integrate style to start module --- source/code/hippie/app.js | 94 ++--------- source/screens/demo/basics.liquid | 8 +- source/screens/demo/components.liquid | 13 +- .../screens/demo/examples/game/index.liquid | 2 - source/screens/demo/examples/start.liquid | 152 +++++++++++++++--- source/screens/demo/examples/ui/tile.liquid | 45 ------ source/style/hippie-style | 2 +- source/style/modules/_start.scss | 98 ++++++++++- source/style/modules/ui/_new_module.scss | 99 ------------ source/style/ui.scss | 1 - 10 files changed, 247 insertions(+), 267 deletions(-) delete mode 100644 source/screens/demo/examples/ui/tile.liquid delete mode 100755 source/style/modules/ui/_new_module.scss diff --git a/source/code/hippie/app.js b/source/code/hippie/app.js index 7cda8b6..eb6eda9 100644 --- a/source/code/hippie/app.js +++ b/source/code/hippie/app.js @@ -540,6 +540,15 @@ function mapRange(value, inMin, inMax, outMin, outMax, reverse = false, clamp = return mapped; } +function zeroFill(number, width) { + width -= number.toString().length; + + if (width > 0) { + return new Array(width + (/\./.test(number) ? 2 : 1)).join('0') + number; + } + return number + ''; // always return a string +} + // Source - https://stackoverflow.com/a/47480429 // Posted by Etienne Martin, modified by community. See post 'Timeline' for change history // Retrieved 2026-03-08, License - CC BY-SA 4.0 @@ -603,91 +612,6 @@ Clock.prototype.formatDigits = function (val) { return val; }; -function ongoing() { - - var now = new Date(); - - var w = Math.floor(now.getDay()); - var D = ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag']; - var DNumb = Math.floor(now.getDate()); - var MNumb = Math.floor(now.getMonth()); - var M = ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'MaiOktober', 'November', 'Dezember']; - var y = Math.floor(now.getYear()); - if (y < 999) y += 1900; - - var ms = Math.floor(now.getMilliseconds()); - var s = Math.floor(now.getSeconds()); - var m = Math.floor(now.getMinutes() + s / 60); - var h = Math.floor(now.getHours() + m / 60); - - var j2000 = new Date(); // Bezugspunkt ist der 1.1.2000 0:00 UT (entspricht JD 2451544,5) - j2000.setUTCFullYear(2000, 0, 1); - j2000.setUTCHours(0, 0, 0, 0); - - var utc = new Date(); - utc.setUTCFullYear(y, MNumb, DNumb); // Monate müssen im Wertebereich 0...11 übergeben werden - utc.setUTCHours(h, m, s, ms); - - var utc0 = new Date(); - utc0.setUTCFullYear(y, MNumb, DNumb); - utc0.setUTCHours(0, 0, 0, 0); - - var jd = 2451544.5 + (utc - j2000) / 86400000; // Zählung erfolgt in Millisekunden, 1 Tag = 86.400.000 ms - var jdUTC0 = 2451544.5 + (utc0 - j2000) / 86400000; - - var N = jd - 2451545.0; - var L = 280.460 + 0.9856474 * N; // mittlere ekliptikale Länge der Sonne - var g = 357.528 + 0.9856003 * N; // mittlere Anomalie - var el = L + 1.915 * Math.sin(g) + 0.020 * Math.sin(2 * g); - var e = 23.439 - 0.0000004 * N; - var rektaszension = Math.atan((Math.cos(e) * Math.sin(el)) / Math.cos(el)); - - var T = (jdUTC0 - 2451545.0) / 36525; - var stGMT = (((6 * 3600) + (41 * 60) + 50.54841) + (8640184.812866 * T) + (0.093104 * Math.pow(T, 2)) - (0.0000062 * Math.pow(T, 3))) / 3600; - - var stGMT2 = 6.697376 + 2400.05134 * T + 1.002738 * T; - var hWGMT = stGMT2 * 15; - var hW = hWGMT + 11.9566185772; - - var st = (stGMT + (now.getUTCHours() * 1.00273790935)) + (11.9566185772 / 15); // Sommerzeit muss noch berücksichtigt werden - var st24 = Math.abs(st - (Math.round(st / 24) * 24)); - var stH = Math.floor(st24); - var stM = Math.floor((st24 % 1) * 60); - var stS = zeroFill(Math.floor((((st24 % 1) * 60) % 1) * 60), 2); - - var travelWidth = document.body.clientWidth; - var travelHeight = document.body.clientHeight; - var sunPosX = 0; - var sunPosY = 0; - var moonPosX = 0; - var moonPosY = 0; - - var sun = $('#sun').css({ - 'left': (s / 60) * travelWidth, - 'top': (m / 60) * travelHeight - }); - - $('#day').text(D[w]); - $('#dayNumb').text(DNumb); - $('#month').text(M[MNumb]); - $('#year').text(y); - $('#time').text('' + zeroFill(h, 2) + ':' + zeroFill(m, 2) + ':' + zeroFill(s, 2)); - - $('#julian').text(jd.toFixed(6)); - //$('#star').text(stH + ':' + stM + ':' + stS); - $('#star').text(stH + ':' + stM); - $('#star1').text(stGMT); - $('#star2').text(stGMT2); -} - -function zeroFill(number, width) { - width -= number.toString().length; - if (width > 0) { - return new Array(width + (/\./.test(number) ? 2 : 1)).join('0') + number; - } - return number + ''; // always return a string -} - //Länge der Balken im Diagram berechnen function barwidth(size, G, W) { var s = size; diff --git a/source/screens/demo/basics.liquid b/source/screens/demo/basics.liquid index d3c7a08..f1c8560 100644 --- a/source/screens/demo/basics.liquid +++ b/source/screens/demo/basics.liquid @@ -801,7 +801,7 @@ order: 2 <fieldset> realisiert.

-
+
Einfache Eingabeelemente -
+
@@ -846,7 +846,7 @@ order: 2
Einfache Eingabeelemente mit Stil -
+
@@ -883,7 +883,7 @@ order: 2 Information oder lockern das Erscheinungsbild auf.

Hier nun eine Liste weiterer Arten von Eingabefeldern:

-
+
diff --git a/source/screens/demo/components.liquid b/source/screens/demo/components.liquid index 2ea1d8d..98f582c 100644 --- a/source/screens/demo/components.liquid +++ b/source/screens/demo/components.liquid @@ -286,12 +286,17 @@ order: 3 Zelle mit Angabe der Breite. - 
table.flexible>tr>td+td.truncate.ellipsis+td
- + 
table.grid>(tr>td+td.ellipsis+td)*2
+
- - + + + + + + +
IndexZelle mit viel Inhalt der nicht umbricht und eingeschränkt wird.Zelle mit Angabe der Breite.Zelle mit viel Inhalt der nicht umbricht und eingeschränkt wird.Inhalt bestimmt die Breite
101Zelle mit viel Inhalt der nicht umbricht und eingeschränkt wird.Zelle
diff --git a/source/screens/demo/examples/game/index.liquid b/source/screens/demo/examples/game/index.liquid index d939850..6dc8d2f 100644 --- a/source/screens/demo/examples/game/index.liquid +++ b/source/screens/demo/examples/game/index.liquid @@ -6,8 +6,6 @@ tags: --- {% layout 'hippie/simple.liquid' %} -{% block title %}{{ title }}{% endblock %} - {% block body %}