From da48591c4ed2fd92b680854c5cc83b1b54f88113 Mon Sep 17 00:00:00 2001 From: Bryan Lancien Date: Thu, 2 May 2024 10:59:58 +0100 Subject: [PATCH 1/9] add more space between charts --- digiplan/static/js/charts.js | 4 ++-- digiplan/static/scss/layouts/_results.scss | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/digiplan/static/js/charts.js b/digiplan/static/js/charts.js index 3165a9e9..7dc05886 100644 --- a/digiplan/static/js/charts.js +++ b/digiplan/static/js/charts.js @@ -27,7 +27,7 @@ const onboarding_pv_roof_chart = echarts.init(onboarding_pv_roof_div); PubSub.subscribe(eventTopics.MENU_CHANGED, resizeCharts); // Styling variables -const chart_tooltip = { +/* const chart_tooltip = { trigger: 'axis', axisPointer: { type: 'shadow' @@ -60,7 +60,7 @@ const chart_legend = { bottom: '0', itemWidth: 10, itemHeight: 10 -}; +}; */ // CHARTS -> defined in /map/charts/ diff --git a/digiplan/static/scss/layouts/_results.scss b/digiplan/static/scss/layouts/_results.scss index 40ecab77..7ac3ca51 100644 --- a/digiplan/static/scss/layouts/_results.scss +++ b/digiplan/static/scss/layouts/_results.scss @@ -119,13 +119,21 @@ &__row { @extend .row; + @extend .pb-4; @extend .mb-4; - @extend .g-4; } &__item { @extend .col-xl-6; + &:nth-of-type(odd) { + padding: 1rem 5rem 2rem 1rem; + } + + &:nth-of-type(even) { + padding: 1rem 1rem 2rem 5rem; + } + @include media-breakpoint-up(xl) { &:first-of-type { border-right: 1px solid $gray-200; @@ -139,7 +147,7 @@ } &__chart { - height: 400px; + height: 300px; width: 100%; } From 0289ef88a8a8555c85ac6614a38e910e8c3f316a Mon Sep 17 00:00:00 2001 From: Bryan Lancien Date: Thu, 2 May 2024 12:07:09 +0100 Subject: [PATCH 2/9] add arrow icon as scroll indicator --- digiplan/static/js/elements.js | 36 ++++++++++++++++++- digiplan/static/scss/app.scss | 1 + .../static/scss/components/_arrow-down.scss | 28 +++++++++++++++ .../templates/components/results_view.html | 11 ++++-- 4 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 digiplan/static/scss/components/_arrow-down.scss diff --git a/digiplan/static/js/elements.js b/digiplan/static/js/elements.js index bac23126..388aa9f1 100644 --- a/digiplan/static/js/elements.js +++ b/digiplan/static/js/elements.js @@ -73,4 +73,38 @@ document.addEventListener('DOMContentLoaded', function() { svgContainer.style.display = 'block'; } }); -}); + + // Adding down arrow as scroll indicator + const arrow = document.querySelector('.arrow-container'); + const resultTab = document.querySelector('#results-pv-tab.nav-link'); + const mainTabContent = document.querySelector('#mainTabContent'); + let arrowDisplayed = false; + + if (resultTab && mainTabContent) { + const observer = new MutationObserver(function(mutations) { + mutations.forEach(mutation => { + if (mutation.attributeName === 'class' && !arrowDisplayed) { + if (resultTab.classList.contains('active')) { + setTimeout(() => { + arrow.classList.add('show'); + arrowDisplayed = true; + }, 1000); + } + } + }); + }); + + observer.observe(resultTab, { + attributes: true + }); + + mainTabContent.addEventListener('scroll', function() { + let threshold = mainTabContent.scrollHeight - mainTabContent.clientHeight - 300; + if (mainTabContent.scrollTop >= threshold && arrowDisplayed) { + arrow.classList.remove('show'); + } + }); + } else { + console.error('The required elements were not found in the DOM.'); + } +}); \ No newline at end of file diff --git a/digiplan/static/scss/app.scss b/digiplan/static/scss/app.scss index ddaafe45..e747419f 100644 --- a/digiplan/static/scss/app.scss +++ b/digiplan/static/scss/app.scss @@ -8,6 +8,7 @@ @import 'base/fonts'; @import 'base/mixins'; +@import 'components/arrow-down'; @import 'components/buttons'; @import 'components/carousel'; @import 'components/charts'; diff --git a/digiplan/static/scss/components/_arrow-down.scss b/digiplan/static/scss/components/_arrow-down.scss new file mode 100644 index 00000000..b3a4edaf --- /dev/null +++ b/digiplan/static/scss/components/_arrow-down.scss @@ -0,0 +1,28 @@ +.arrow-container { + position: absolute; + left: 49.5%; + bottom: 5rem; + transform: translateX(-50%) translateY(0); + visibility: hidden; + opacity: 0; + transition: visibility 0s, opacity 0.5s ease-in-out; + animation: none; +} + +.arrow-container.show { + visibility: visible; + opacity: 1; + animation: bounce 2s infinite; +} + +@keyframes bounce { + 0%, 20%, 50%, 80%, 100% { + transform: translateX(-50%) translateY(0); + } + 40% { + transform: translateX(-50%) translateY(-10px); + } + 60% { + transform: translateX(-50%) translateY(-5px); + } +} diff --git a/digiplan/templates/components/results_view.html b/digiplan/templates/components/results_view.html index 19e8a931..3947640f 100644 --- a/digiplan/templates/components/results_view.html +++ b/digiplan/templates/components/results_view.html @@ -86,7 +86,7 @@

{% translate "Windenergie" %}

-

{% translate "Freiflächen-Photovoltaik" %}

+

{% translate "1. Freiflächen-Photovoltaik" %}

@@ -105,7 +105,7 @@

{% translate "Freiflächen-Photovoltaik" %}

-

{% translate "Aufdach-Photovoltaik" %}

+

{% translate "2. Aufdach-Photovoltaik" %}

@@ -123,6 +123,11 @@

{% translate "Aufdach-Photovoltaik" %}

+
+ + + +
@@ -316,4 +321,4 @@

{% translate "Abschätzung CO2-Emissionen" %}

- + Date: Thu, 2 May 2024 17:01:07 +0100 Subject: [PATCH 3/9] make small styling changes to arrow --- digiplan/static/scss/components/_arrow-down.scss | 4 ++-- digiplan/templates/components/results_view.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/digiplan/static/scss/components/_arrow-down.scss b/digiplan/static/scss/components/_arrow-down.scss index b3a4edaf..1273be66 100644 --- a/digiplan/static/scss/components/_arrow-down.scss +++ b/digiplan/static/scss/components/_arrow-down.scss @@ -20,9 +20,9 @@ transform: translateX(-50%) translateY(0); } 40% { - transform: translateX(-50%) translateY(-10px); + transform: translateX(-50%) translateY(-15px); } 60% { - transform: translateX(-50%) translateY(-5px); + transform: translateX(-50%) translateY(-7px); } } diff --git a/digiplan/templates/components/results_view.html b/digiplan/templates/components/results_view.html index 3947640f..383cb471 100644 --- a/digiplan/templates/components/results_view.html +++ b/digiplan/templates/components/results_view.html @@ -124,7 +124,7 @@

{% translate "2. Aufdach-Photovoltaik" %}

- +
From 51537a8331b596b15d406732360c64a8a531d586 Mon Sep 17 00:00:00 2001 From: Bryan Lancien Date: Thu, 2 May 2024 18:01:38 +0100 Subject: [PATCH 4/9] improve charts layout --- digiplan/map/charts/capacity.json | 1 + digiplan/map/charts/detailed_overview.json | 2 +- digiplan/map/charts/electricity_overview.json | 2 +- digiplan/map/charts/general_options.json | 3 ++- digiplan/map/charts/heat_centralized.json | 3 ++- digiplan/map/charts/heat_decentralized.json | 3 ++- digiplan/map/charts/heat_demand.json | 1 + digiplan/map/charts/mobility_ghg.json | 2 +- digiplan/map/charts/mobility_overview.json | 2 +- digiplan/map/charts/onboarding_pv_ground.json | 3 ++- digiplan/map/charts/onboarding_pv_roof.json | 3 ++- digiplan/map/charts/onboarding_wind.json | 3 ++- digiplan/map/charts/overview_heat.json | 2 +- digiplan/map/charts/pv_ground_areas.json | 5 +++-- digiplan/map/charts/pv_ground_capacity.json | 5 +++-- digiplan/map/charts/pv_roof_areas.json | 5 +++-- digiplan/map/charts/pv_roof_capacity.json | 5 +++-- .../charts/renewable_electricity_production.json | 1 + digiplan/map/charts/wind_areas.json | 5 +++-- digiplan/map/charts/wind_capacity.json | 5 +++-- digiplan/static/scss/layouts/_results.scss | 15 +++++++++++++-- 21 files changed, 51 insertions(+), 25 deletions(-) diff --git a/digiplan/map/charts/capacity.json b/digiplan/map/charts/capacity.json index 3d23f9e3..273dfa6b 100644 --- a/digiplan/map/charts/capacity.json +++ b/digiplan/map/charts/capacity.json @@ -12,6 +12,7 @@ "Wasserkraft", "Bioenergie" ], + "itemGap": 15, "orient": "vertical", "right": "-5%", "bottom": "15%" diff --git a/digiplan/map/charts/detailed_overview.json b/digiplan/map/charts/detailed_overview.json index 9e45061a..7467fbc4 100644 --- a/digiplan/map/charts/detailed_overview.json +++ b/digiplan/map/charts/detailed_overview.json @@ -16,7 +16,7 @@ "top": "10%", "left": "3%", "right": "15%", - "bottom": "20%", + "bottom": "18%", "containLabel": true }, "yAxis": { diff --git a/digiplan/map/charts/electricity_overview.json b/digiplan/map/charts/electricity_overview.json index cdb574db..ef90f7e3 100644 --- a/digiplan/map/charts/electricity_overview.json +++ b/digiplan/map/charts/electricity_overview.json @@ -3,7 +3,7 @@ "top": "10%", "left": "3%", "right": "15%", - "bottom": "20%", + "bottom": "30%", "containLabel": true }, "yAxis": { diff --git a/digiplan/map/charts/general_options.json b/digiplan/map/charts/general_options.json index e0e28ef9..88e89657 100644 --- a/digiplan/map/charts/general_options.json +++ b/digiplan/map/charts/general_options.json @@ -22,6 +22,7 @@ "show": true, "bottom": "12", "itemWidth": 14, - "itemHeight": 14 + "itemHeight": 14, + "itemGap": 15 } } diff --git a/digiplan/map/charts/heat_centralized.json b/digiplan/map/charts/heat_centralized.json index 03a516a8..4784f0b3 100644 --- a/digiplan/map/charts/heat_centralized.json +++ b/digiplan/map/charts/heat_centralized.json @@ -3,7 +3,8 @@ "bottom": "28%" }, "legend": { - "bottom": "0" + "bottom": "0", + "itemGap": 15 }, "brush": { "toolbox": ["rect", "polygon", "lineX", "lineY", "keep", "clear"], diff --git a/digiplan/map/charts/heat_decentralized.json b/digiplan/map/charts/heat_decentralized.json index 82820cad..e8ce75ee 100644 --- a/digiplan/map/charts/heat_decentralized.json +++ b/digiplan/map/charts/heat_decentralized.json @@ -3,7 +3,8 @@ "bottom": "28%" }, "legend": { - "bottom": "0" + "bottom": "0", + "itemGap": 15 }, "brush": { "toolbox": ["rect", "polygon", "lineX", "lineY", "keep", "clear"], diff --git a/digiplan/map/charts/heat_demand.json b/digiplan/map/charts/heat_demand.json index 0c132ca5..07521d41 100644 --- a/digiplan/map/charts/heat_demand.json +++ b/digiplan/map/charts/heat_demand.json @@ -10,6 +10,7 @@ "GHD", "Industrie" ], + "itemGap": 15, "orient": "vertical", "right": "1%", "bottom": "35%" diff --git a/digiplan/map/charts/mobility_ghg.json b/digiplan/map/charts/mobility_ghg.json index cce3d61a..187ee8dd 100644 --- a/digiplan/map/charts/mobility_ghg.json +++ b/digiplan/map/charts/mobility_ghg.json @@ -1,6 +1,6 @@ { "grid": { - "bottom": "20%" + "bottom": "18%" }, "xAxis": { "type": "value", diff --git a/digiplan/map/charts/mobility_overview.json b/digiplan/map/charts/mobility_overview.json index 9d86c5e7..2b420f18 100644 --- a/digiplan/map/charts/mobility_overview.json +++ b/digiplan/map/charts/mobility_overview.json @@ -1,6 +1,6 @@ { "grid": { - "bottom": "20%" + "bottom": "18%" }, "xAxis": { "type": "value", diff --git a/digiplan/map/charts/onboarding_pv_ground.json b/digiplan/map/charts/onboarding_pv_ground.json index 794bdbb1..d78e6092 100644 --- a/digiplan/map/charts/onboarding_pv_ground.json +++ b/digiplan/map/charts/onboarding_pv_ground.json @@ -1,6 +1,7 @@ { "legend": { - "data": ["Installierte Leistung", "Anlagenanzahl"] + "data": ["Installierte Leistung", "Anlagenanzahl"], + "itemGap": 15 }, "xAxis": [ { diff --git a/digiplan/map/charts/onboarding_pv_roof.json b/digiplan/map/charts/onboarding_pv_roof.json index 15f34280..4638196c 100644 --- a/digiplan/map/charts/onboarding_pv_roof.json +++ b/digiplan/map/charts/onboarding_pv_roof.json @@ -1,6 +1,7 @@ { "legend": { - "data": ["Installierte Leistung", "Anlagenanzahl"] + "data": ["Installierte Leistung", "Anlagenanzahl"], + "itemGap": 15 }, "xAxis": [ { diff --git a/digiplan/map/charts/onboarding_wind.json b/digiplan/map/charts/onboarding_wind.json index 891e61a6..750c5aa2 100644 --- a/digiplan/map/charts/onboarding_wind.json +++ b/digiplan/map/charts/onboarding_wind.json @@ -1,6 +1,7 @@ { "legend": { - "data": ["Installierte Leistung", "Anlagenanzahl"] + "data": ["Installierte Leistung", "Anlagenanzahl"], + "itemGap": 15 }, "xAxis": [ { diff --git a/digiplan/map/charts/overview_heat.json b/digiplan/map/charts/overview_heat.json index 09f512e6..e1b708a0 100644 --- a/digiplan/map/charts/overview_heat.json +++ b/digiplan/map/charts/overview_heat.json @@ -1,6 +1,6 @@ { "grid": { - "bottom": "20%" + "bottom": "18%" }, "xAxis": { "type": "value", diff --git a/digiplan/map/charts/pv_ground_areas.json b/digiplan/map/charts/pv_ground_areas.json index 39e74806..d34c4025 100644 --- a/digiplan/map/charts/pv_ground_areas.json +++ b/digiplan/map/charts/pv_ground_areas.json @@ -6,13 +6,14 @@ } }, "legend": { - "data": ["Fläche (ha)", "% der Regionsfläche"] + "data": ["Fläche (ha)", "% der Regionsfläche"], + "itemGap": 15 }, "grid": { "top": "10%", "left": "3%", "right": "3%", - "bottom": "10%", + "bottom": "18%", "containLabel": true }, "xAxis": { diff --git a/digiplan/map/charts/pv_ground_capacity.json b/digiplan/map/charts/pv_ground_capacity.json index 5ca16be6..48209aa0 100644 --- a/digiplan/map/charts/pv_ground_capacity.json +++ b/digiplan/map/charts/pv_ground_capacity.json @@ -6,13 +6,14 @@ } }, "legend": { - "data": ["Leistung", "Anlagenanzahl"] + "data": ["Leistung", "Anlagenanzahl"], + "itemGap": 15 }, "grid": { "top": "10%", "left": "3%", "right": "3%", - "bottom": "10%", + "bottom": "18%", "containLabel": true }, "xAxis": { diff --git a/digiplan/map/charts/pv_roof_areas.json b/digiplan/map/charts/pv_roof_areas.json index 29bde432..0e2f1279 100644 --- a/digiplan/map/charts/pv_roof_areas.json +++ b/digiplan/map/charts/pv_roof_areas.json @@ -6,13 +6,14 @@ } }, "legend": { - "data": ["Fläche (ha)", "% des Potenzials"] + "data": ["Fläche (ha)", "% des Potenzials"], + "itemGap": 15 }, "grid": { "top": "10%", "left": "3%", "right": "3%", - "bottom": "10%", + "bottom": "18%", "containLabel": true }, "xAxis": { diff --git a/digiplan/map/charts/pv_roof_capacity.json b/digiplan/map/charts/pv_roof_capacity.json index 59bd808d..982d549d 100644 --- a/digiplan/map/charts/pv_roof_capacity.json +++ b/digiplan/map/charts/pv_roof_capacity.json @@ -6,13 +6,14 @@ } }, "legend": { - "data": ["Leistung", "Anlagenanzahl"] + "data": ["Leistung", "Anlagenanzahl"], + "itemGap": 15 }, "grid": { "top": "10%", "left": "3%", "right": "3%", - "bottom": "10%", + "bottom": "18%", "containLabel": true }, "xAxis": { diff --git a/digiplan/map/charts/renewable_electricity_production.json b/digiplan/map/charts/renewable_electricity_production.json index 261fe90c..a1f96b2e 100644 --- a/digiplan/map/charts/renewable_electricity_production.json +++ b/digiplan/map/charts/renewable_electricity_production.json @@ -12,6 +12,7 @@ "Bioenergie", "Konventionell" ], + "itemGap": 15, "orient": "vertical", "right": "1%", "bottom": "5%" diff --git a/digiplan/map/charts/wind_areas.json b/digiplan/map/charts/wind_areas.json index d44e155b..f533d15a 100644 --- a/digiplan/map/charts/wind_areas.json +++ b/digiplan/map/charts/wind_areas.json @@ -6,13 +6,14 @@ } }, "legend": { - "data": ["Fläche (ha)", "% der Regionsfläche"] + "data": ["Fläche (ha)", "% der Regionsfläche"], + "itemGap": 15 }, "grid": { "top": "10%", "left": "3%", "right": "3%", - "bottom": "10%", + "bottom": "18%", "containLabel": true }, "xAxis": { diff --git a/digiplan/map/charts/wind_capacity.json b/digiplan/map/charts/wind_capacity.json index 421780f5..13c8c549 100644 --- a/digiplan/map/charts/wind_capacity.json +++ b/digiplan/map/charts/wind_capacity.json @@ -6,13 +6,14 @@ } }, "legend": { - "data": ["Leistung", "Anlagenanzahl"] + "data": ["Leistung", "Anlagenanzahl"], + "itemGap": 15 }, "grid": { "top": "10%", "left": "3%", "right": "3%", - "bottom": "10%", + "bottom": "18%", "containLabel": true }, "xAxis": { diff --git a/digiplan/static/scss/layouts/_results.scss b/digiplan/static/scss/layouts/_results.scss index 7ac3ca51..7bd21e28 100644 --- a/digiplan/static/scss/layouts/_results.scss +++ b/digiplan/static/scss/layouts/_results.scss @@ -106,21 +106,32 @@ padding-right: 5rem !important; } + a { + @extend .fw-semibold; + } + &__container { @extend .container; + @extend .mb-4; } &__header { + @extend .pt-4; + h2 { @extend .fs-6; @extend .ps-0; + @extend .text-center; } } &__row { @extend .row; @extend .pb-4; - @extend .mb-4; + + &:not(:last-of-type) { + @extend .border-bottom; + } } &__item { @@ -147,7 +158,7 @@ } &__chart { - height: 300px; + height: 340px; width: 100%; } From 5d04032d84543227c1d41a4be4f7d665d85fcd32 Mon Sep 17 00:00:00 2001 From: Bryan Lancien Date: Thu, 2 May 2024 18:03:28 +0100 Subject: [PATCH 5/9] fix bug on arrow indicator --- digiplan/static/js/elements.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/digiplan/static/js/elements.js b/digiplan/static/js/elements.js index 388aa9f1..2704beeb 100644 --- a/digiplan/static/js/elements.js +++ b/digiplan/static/js/elements.js @@ -85,10 +85,8 @@ document.addEventListener('DOMContentLoaded', function() { mutations.forEach(mutation => { if (mutation.attributeName === 'class' && !arrowDisplayed) { if (resultTab.classList.contains('active')) { - setTimeout(() => { - arrow.classList.add('show'); - arrowDisplayed = true; - }, 1000); + arrow.classList.add('show'); + arrowDisplayed = true; } } }); From ee11cafbbb16be5cbdabd8357800c20be932eba1 Mon Sep 17 00:00:00 2001 From: nesnoj Date: Thu, 2 May 2024 22:51:13 +0200 Subject: [PATCH 6/9] Slightly adjust result chart layout --- digiplan/map/charts/detailed_overview.json | 2 +- digiplan/map/charts/pv_ground_areas.json | 2 +- digiplan/map/charts/pv_ground_capacity.json | 2 +- digiplan/map/charts/pv_roof_areas.json | 2 +- digiplan/map/charts/pv_roof_capacity.json | 2 +- digiplan/map/charts/wind_areas.json | 2 +- digiplan/map/charts/wind_capacity.json | 2 +- digiplan/static/scss/layouts/_results.scss | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/digiplan/map/charts/detailed_overview.json b/digiplan/map/charts/detailed_overview.json index 7467fbc4..a8e9d92f 100644 --- a/digiplan/map/charts/detailed_overview.json +++ b/digiplan/map/charts/detailed_overview.json @@ -16,7 +16,7 @@ "top": "10%", "left": "3%", "right": "15%", - "bottom": "18%", + "bottom": "14%", "containLabel": true }, "yAxis": { diff --git a/digiplan/map/charts/pv_ground_areas.json b/digiplan/map/charts/pv_ground_areas.json index d34c4025..e7cae9b6 100644 --- a/digiplan/map/charts/pv_ground_areas.json +++ b/digiplan/map/charts/pv_ground_areas.json @@ -13,7 +13,7 @@ "top": "10%", "left": "3%", "right": "3%", - "bottom": "18%", + "bottom": "14%", "containLabel": true }, "xAxis": { diff --git a/digiplan/map/charts/pv_ground_capacity.json b/digiplan/map/charts/pv_ground_capacity.json index 48209aa0..faf645dc 100644 --- a/digiplan/map/charts/pv_ground_capacity.json +++ b/digiplan/map/charts/pv_ground_capacity.json @@ -13,7 +13,7 @@ "top": "10%", "left": "3%", "right": "3%", - "bottom": "18%", + "bottom": "14%", "containLabel": true }, "xAxis": { diff --git a/digiplan/map/charts/pv_roof_areas.json b/digiplan/map/charts/pv_roof_areas.json index 0e2f1279..5010374b 100644 --- a/digiplan/map/charts/pv_roof_areas.json +++ b/digiplan/map/charts/pv_roof_areas.json @@ -13,7 +13,7 @@ "top": "10%", "left": "3%", "right": "3%", - "bottom": "18%", + "bottom": "14%", "containLabel": true }, "xAxis": { diff --git a/digiplan/map/charts/pv_roof_capacity.json b/digiplan/map/charts/pv_roof_capacity.json index 982d549d..55c33ccf 100644 --- a/digiplan/map/charts/pv_roof_capacity.json +++ b/digiplan/map/charts/pv_roof_capacity.json @@ -13,7 +13,7 @@ "top": "10%", "left": "3%", "right": "3%", - "bottom": "18%", + "bottom": "14%", "containLabel": true }, "xAxis": { diff --git a/digiplan/map/charts/wind_areas.json b/digiplan/map/charts/wind_areas.json index f533d15a..393d34d1 100644 --- a/digiplan/map/charts/wind_areas.json +++ b/digiplan/map/charts/wind_areas.json @@ -13,7 +13,7 @@ "top": "10%", "left": "3%", "right": "3%", - "bottom": "18%", + "bottom": "14%", "containLabel": true }, "xAxis": { diff --git a/digiplan/map/charts/wind_capacity.json b/digiplan/map/charts/wind_capacity.json index 13c8c549..9891a5f4 100644 --- a/digiplan/map/charts/wind_capacity.json +++ b/digiplan/map/charts/wind_capacity.json @@ -13,7 +13,7 @@ "top": "10%", "left": "3%", "right": "3%", - "bottom": "18%", + "bottom": "14%", "containLabel": true }, "xAxis": { diff --git a/digiplan/static/scss/layouts/_results.scss b/digiplan/static/scss/layouts/_results.scss index 7bd21e28..6e00f136 100644 --- a/digiplan/static/scss/layouts/_results.scss +++ b/digiplan/static/scss/layouts/_results.scss @@ -13,7 +13,7 @@ .main-results { @extend .container; - @extend .mb-4; + @extend .mb-2; &__row { @extend .row; @@ -116,7 +116,7 @@ } &__header { - @extend .pt-4; + @extend .pt-3; h2 { @extend .fs-6; @@ -138,11 +138,11 @@ @extend .col-xl-6; &:nth-of-type(odd) { - padding: 1rem 5rem 2rem 1rem; + padding: 1rem 3rem 2rem 1rem; } &:nth-of-type(even) { - padding: 1rem 1rem 2rem 5rem; + padding: 1rem 1rem 2rem 3rem; } @include media-breakpoint-up(xl) { From 3a8c99f1c721201dd4c73e5935d9554e065291be Mon Sep 17 00:00:00 2001 From: nesnoj Date: Thu, 2 May 2024 22:54:50 +0200 Subject: [PATCH 7/9] Make lint happy --- digiplan/static/js/elements.js | 2 +- digiplan/templates/components/results_view.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/digiplan/static/js/elements.js b/digiplan/static/js/elements.js index 2704beeb..e09b15aa 100644 --- a/digiplan/static/js/elements.js +++ b/digiplan/static/js/elements.js @@ -105,4 +105,4 @@ document.addEventListener('DOMContentLoaded', function() { } else { console.error('The required elements were not found in the DOM.'); } -}); \ No newline at end of file +}); diff --git a/digiplan/templates/components/results_view.html b/digiplan/templates/components/results_view.html index 383cb471..71a0114e 100644 --- a/digiplan/templates/components/results_view.html +++ b/digiplan/templates/components/results_view.html @@ -321,4 +321,4 @@

{% translate "Abschätzung CO2-Emissionen" %}

- Date: Thu, 2 May 2024 23:03:42 +0200 Subject: [PATCH 8/9] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d125416..4fc8f63f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project tries to adhere to [Semantic Versioning](https://semver.org/spe - key results for wind, pv ground and pv roof settings panels - scenario settings - additional slider marker +- result chart arrow indicator ### Changed - Adapt municipality label font size according to zoom level From 6726e4abdf3cfbdbf63f71c188beee05a9349bdf Mon Sep 17 00:00:00 2001 From: nesnoj Date: Fri, 3 May 2024 10:40:31 +0200 Subject: [PATCH 9/9] Suppress jshint import error --- digiplan/static/js/elements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/digiplan/static/js/elements.js b/digiplan/static/js/elements.js index e09b15aa..ec9ebeb4 100644 --- a/digiplan/static/js/elements.js +++ b/digiplan/static/js/elements.js @@ -81,7 +81,7 @@ document.addEventListener('DOMContentLoaded', function() { let arrowDisplayed = false; if (resultTab && mainTabContent) { - const observer = new MutationObserver(function(mutations) { + const observer = new MutationObserver(function(mutations) { //jshint ignore:line mutations.forEach(mutation => { if (mutation.attributeName === 'class' && !arrowDisplayed) { if (resultTab.classList.contains('active')) {