From 2e1d8f5fc5dfd5e8ee2947403ff73a12af857b34 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 2 Nov 2023 02:59:42 +0100 Subject: [PATCH] Adding Logo to bauchbinde --- .gitignore | 1 + assets/images/geekend_23.svg | 7 +- assets/images/geekend_23_bauchbinde.svg | 118 ++++++++++++++++++ assets/js/custom/dom/speaker-info.js | 1 + assets/rendered_speaker-info-vortragsraum.js | 1 + .../scss/css/custom/nodes/speaker-info.scss | 2 +- .../css/custom/styles/_banner-speaker.scss | 26 ++-- assets/scss/css/custom/styles/_variables.scss | 6 +- templates/html5infobeamer.html | 4 +- 9 files changed, 147 insertions(+), 19 deletions(-) create mode 100644 assets/images/geekend_23_bauchbinde.svg diff --git a/.gitignore b/.gitignore index dfb962a..12141e6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ assets/css/fonts*.css assets/css/schedule*.css assets/css/talk-info*.css +*.swp diff --git a/assets/images/geekend_23.svg b/assets/images/geekend_23.svg index 1dbf2d7..baf009a 100644 --- a/assets/images/geekend_23.svg +++ b/assets/images/geekend_23.svg @@ -16,7 +16,8 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/">Aalen Geekend 2023 - HTML5 InfobeamerL3D <l3d@c3woc.de>L3D <l3d@c3woc.de>Aalen Geekend 2023 - HTML5 Infobeamer + + +Aalen Geekend 2023 - BauchbindeL3D <l3d@c3woc.de>Aalen Geekend 2023 - Bauchbinde diff --git a/assets/js/custom/dom/speaker-info.js b/assets/js/custom/dom/speaker-info.js index d32f1bf..cb58203 100644 --- a/assets/js/custom/dom/speaker-info.js +++ b/assets/js/custom/dom/speaker-info.js @@ -11,6 +11,7 @@ const html = htm.bind(preact.h); const event_info = (event) => { const ti = serv.type_index(sol.eventType(event)); return html` +
${serv.fix_dash(serv.person_names_concat(sol.eventPersons(event)))}
diff --git a/assets/rendered_speaker-info-vortragsraum.js b/assets/rendered_speaker-info-vortragsraum.js index 18a9d76..18e9849 100644 --- a/assets/rendered_speaker-info-vortragsraum.js +++ b/assets/rendered_speaker-info-vortragsraum.js @@ -5920,6 +5920,7 @@ var event_info = (event) => { const ti = type_index(eventType(event)); return html` +
${fix_dash(person_names_concat(eventPersons(event)))}
diff --git a/assets/scss/css/custom/nodes/speaker-info.scss b/assets/scss/css/custom/nodes/speaker-info.scss index 83cb99b..84f8fed 100644 --- a/assets/scss/css/custom/nodes/speaker-info.scss +++ b/assets/scss/css/custom/nodes/speaker-info.scss @@ -1,3 +1,3 @@ -@import "../styles/_base"; +// @import "../styles/_base"; @import "../styles/_banner-speaker"; diff --git a/assets/scss/css/custom/styles/_banner-speaker.scss b/assets/scss/css/custom/styles/_banner-speaker.scss index 606a43e..497ab3e 100644 --- a/assets/scss/css/custom/styles/_banner-speaker.scss +++ b/assets/scss/css/custom/styles/_banner-speaker.scss @@ -1,26 +1,30 @@ @import "_variables"; -@import "_base"; - -.slide { - background-color: $color-bg; -} .speaker-box { // position: absolute; position: relative; - top: 950px; - left: 50px; - + top: 910px; + left: 180px; width: auto; - max-width: 1000px; + max-width: 850px; } +.speaker_event_logo { + background-image: url("/images/geekend_23_bauchbinde.svg"); + background-repeat: no-repeat; + position: relative; + top: 850px; + left: 50px; + width: 230px; + height: 230px; + position: absolute; +} .speaker { - background-color: $color-bg-medium; + background-color: $color-bauchbinde; border-width: 0 0 0 10px; border-style: solid; - border-color: $color-orange-strong; + border-color: $color-bauchbinde-akzent; //---vertical-align: middle; white-space: normal; diff --git a/assets/scss/css/custom/styles/_variables.scss b/assets/scss/css/custom/styles/_variables.scss index 0130288..b4bc489 100644 --- a/assets/scss/css/custom/styles/_variables.scss +++ b/assets/scss/css/custom/styles/_variables.scss @@ -3,8 +3,6 @@ $full-height: 1080px; $color-bg: rgb(26, 23, 51); -// $color-bg: rgb(20, 29, 36); -$color-bg-medium: rgb(7, 7, 74); $color-speaker: rgb(255, 40, 40); $color-talk: rgb(40, 231, 255); @@ -12,3 +10,7 @@ $color-talk: rgb(40, 231, 255); $color-warm-white: rgb(255, 252, 234); $color-orange-strong: rgb(247, 107, 28); + +// bauchbinde +$color-bauchbinde: rgb(26, 23, 51); +$color-bauchbinde-akzent: rgb(255, 255, 255); diff --git a/templates/html5infobeamer.html b/templates/html5infobeamer.html index 651dcbf..7387025 100644 --- a/templates/html5infobeamer.html +++ b/templates/html5infobeamer.html @@ -15,9 +15,9 @@ {% if this.type == 'infobeamer' or this.type == 'infobeamer-with-music' %} - + {% elif this.type == 'bauchbinde' %} - + {% endif %}