Merge branch 'master' into olivier/TRAFDIV-1166_at

geops · Feb 13, 2024 · 522c8f1 · 522c8f1
2 parents 2183901 + 1cda4a5
commit 522c8f1
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.27.7](https://github.com/geops/trafimage-maps/compare/v1.27.6...v1.27.7) (2024-02-12)
+
+### Bug Fixes
+
+- **geltungsbereiche:** fix button and layer styling for iframes ([#1141](https://github.com/geops/trafimage-maps/issues/1141)) ([e330633](https://github.com/geops/trafimage-maps/commit/e3306338db80d7196d565f2cf531680fcb9e93e9))
+
+### [1.27.6](https://github.com/geops/trafimage-maps/compare/v1.27.5...v1.27.6) (2024-02-09)
+
+### Bug Fixes
+
+- **gemeindegrenzen:** change date in legend ([#1145](https://github.com/geops/trafimage-maps/issues/1145)) ([913f081](https://github.com/geops/trafimage-maps/commit/913f081fb0ced8bb78d0a58a59a53b404b11026e))
+
 ### [1.27.5](https://github.com/geops/trafimage-maps/compare/v1.27.4...v1.27.5) (2024-02-08)
 
 ### Bug Fixes

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "trafimage-maps",
   "description": "trafimage-maps web component",
-  "version": "1.27.5",
+  "version": "1.27.7",
   "private": true,
   "main": "build/bundle.js",
   "proxy": "http://127.0.0.1:8000",

diff --git a/src/lang/de.json b/src/lang/de.json
@@ -123,7 +123,7 @@
   "ch.sbb.betriebsregionen-desc": "Geographische Aufteilung der Infrastruktur SBB.",
   "ch.sbb.casa": "CASA",
   "ch.sbb.ch_gemeinden": "Gemeindegrenzen",
-  "ch.sbb.ch_gemeinden-desc": "<p>Blenden Sie die Gemeindegrenzen ein/aus. Die Gemeinden finden Sie über das Suchfeld.</p><p>Daten:<br/>Bundesamt für Statistik, swisstopo (01.01.2023)</p>",
+  "ch.sbb.ch_gemeinden-desc": "<p>Blenden Sie die Gemeindegrenzen ein/aus. Die Gemeinden finden Sie über das Suchfeld.</p><p>Daten:<br/>Bundesamt für Statistik, swisstopo (01.01.2024)</p>",
   "ch.sbb.construction": "Bauprojekte Bahninfrastruktur",
   "ch.sbb.construction-angebotsschritt-2035": "Angebotsschritt 2035",
   "ch.sbb.construction.ausbau.bahnhof": "Bahnhof",
@@ -222,7 +222,7 @@
   "ch.sbb.infrastruktur.gemeindegrenzen.greengrenzen": "Grüne Grenzlinie",
   "ch.sbb.infrastruktur.gemeindegrenzen.greygrenzen": "Graue Grenzlinie",
   "ch.sbb.infrastruktur.gemeindegrenzen.group": "Gemeindegrenzen",
-  "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "<p>Gemeindegrenzen</p><p>Daten:<br/>Bundesamt für Statistik, swisstopo (01.01.2023)</p>",
+  "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "<p>Gemeindegrenzen</p><p>Daten:<br/>Bundesamt für Statistik, swisstopo (01.01.2024)</p>",
   "ch.sbb.infrastruktur.gewaesser.group": "Gewässer",
   "ch.sbb.infrastruktur.gewaesser.group-desc": "Gewässer",
   "ch.sbb.infrastruktur.grenzen.group": "Grenzen",

diff --git a/src/lang/en.json b/src/lang/en.json
@@ -135,7 +135,7 @@
   "ch.sbb.betriebsregionen-desc": "Geographical distribution of SBB infrastructure.",
   "ch.sbb.casa": "CASA",
   "ch.sbb.ch_gemeinden": "Municipal borders",
-  "ch.sbb.ch_gemeinden-desc": "<p>Show/hide the municipal borders. You can find municipalities using the search field.</p><p>Data:<br/>Federal Statistical Office, swisstopo (01.01.2023)</p>",
+  "ch.sbb.ch_gemeinden-desc": "<p>Show/hide the municipal borders. You can find municipalities using the search field.</p><p>Data:<br/>Federal Statistical Office, swisstopo (01.01.2024)</p>",
   "ch.sbb.construction": "Railway infrastructure construction projects",
   "ch.sbb.construction-angebotsschritt-2035": "Expansion rail network 2035",
   "ch.sbb.construction.ausbau.bahnhof": "Station",
@@ -232,7 +232,7 @@
   "ch.sbb.infrastruktur.gemeindegrenzen.greengrenzen": "Green border line",
   "ch.sbb.infrastruktur.gemeindegrenzen.greygrenzen": "Grey border line",
   "ch.sbb.infrastruktur.gemeindegrenzen.group": "Municipal borders",
-  "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "<p>Municipal borders</p><p>Data:<br/>Federal Statistical Office, swisstopo (01.01.2023)</p>",
+  "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "<p>Municipal borders</p><p>Data:<br/>Federal Statistical Office, swisstopo (01.01.2024)</p>",
   "ch.sbb.infrastruktur.gewaesser.group": "Bodies of water",
   "ch.sbb.infrastruktur.gewaesser.group-desc": "Bodies of water",
   "ch.sbb.infrastruktur.grenzen.group": "Borders",

diff --git a/src/lang/fr.json b/src/lang/fr.json
@@ -144,7 +144,7 @@
   "ch.sbb.betriebsregionen-desc": "Répartition géographique de l'infrastructure des CFF.",
   "ch.sbb.casa": "CASA",
   "ch.sbb.ch_gemeinden": "Limites de commune",
-  "ch.sbb.ch_gemeinden-desc": "<p>Affichez/masquez les limites communales. Vous trouvez les communes via le champ de recherche.</p><p>Données:<br/>Office fédéral de la statistique, swisstopo (01.01.2023)</p>",
+  "ch.sbb.ch_gemeinden-desc": "<p>Affichez/masquez les limites communales. Vous trouvez les communes via le champ de recherche.</p><p>Données:<br/>Office fédéral de la statistique, swisstopo (01.01.2024)</p>",
   "ch.sbb.construction": "Projet de construction de l'infrastructure ferroviaire",
   "ch.sbb.construction-angebotsschritt-2035": "Développement de l’offre 2035",
   "ch.sbb.construction.ausbau.bahnhof": "Gare",
@@ -243,7 +243,7 @@
   "ch.sbb.infrastruktur.gemeindegrenzen.greengrenzen": "Ligne de démarcation verte",
   "ch.sbb.infrastruktur.gemeindegrenzen.greygrenzen": "Ligne de démarcation grise",
   "ch.sbb.infrastruktur.gemeindegrenzen.group": "Limites communales",
-  "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "<p>Limites communales</p><p>Données:<br/>Office fédéral de la statistique, swisstopo (01.01.2023)</p>",
+  "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "<p>Limites communales</p><p>Données:<br/>Office fédéral de la statistique, swisstopo (01.01.2024)</p>",
   "ch.sbb.infrastruktur.gewaesser.group": "Eaux",
   "ch.sbb.infrastruktur.gewaesser.group-desc": "Eaux",
   "ch.sbb.infrastruktur.grenzen.group": "Frontières",

diff --git a/src/lang/it.json b/src/lang/it.json
@@ -144,7 +144,7 @@
   "ch.sbb.betriebsregionen-desc": "Distribuzione geografica dell'infrastruttura delle FFS.",
   "ch.sbb.casa": "CASA",
   "ch.sbb.ch_gemeinden": "Limiti comunali",
-  "ch.sbb.ch_gemeinden-desc": "<p>Visualizzazione dei confini comunali. I Comuni vengono individuati dal campo di ricerca.</p><p>Dati:<br/>Ufficio federale di statistica, swisstopo (01.01.2023)</p>",
+  "ch.sbb.ch_gemeinden-desc": "<p>Visualizzazione dei confini comunali. I Comuni vengono individuati dal campo di ricerca.</p><p>Dati:<br/>Ufficio federale di statistica, swisstopo (01.01.2024)</p>",
   "ch.sbb.construction": "Progetti di costruzione dell'infrastruttura ferroviaria",
   "ch.sbb.construction-angebotsschritt-2035": "Ampliamento dell’offerta 2035",
   "ch.sbb.construction.ausbau.bahnhof": "Stazione",
@@ -243,7 +243,7 @@
   "ch.sbb.infrastruktur.gemeindegrenzen.greengrenzen": "Linea di confine in verde",
   "ch.sbb.infrastruktur.gemeindegrenzen.greygrenzen": "Linea di confine in grigio",
   "ch.sbb.infrastruktur.gemeindegrenzen.group": "Confini communali",
-  "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "<p>Confini comunali</p><p>Dati:<br/>Ufficio federale di statistica, swisstopo (01.01.2023)</p>",
+  "ch.sbb.infrastruktur.gemeindegrenzen.group-desc": "<p>Confini comunali</p><p>Dati:<br/>Ufficio federale di statistica, swisstopo (01.01.2024)</p>",
   "ch.sbb.infrastruktur.gewaesser.group": "Acque",
   "ch.sbb.infrastruktur.gewaesser.group-desc": "Acque",
   "ch.sbb.infrastruktur.grenzen.group": "Confini",

diff --git a/src/menus/GeltungsbereicheTopicMenu/GeltungsbereicheTopicMenu.js b/src/menus/GeltungsbereicheTopicMenu/GeltungsbereicheTopicMenu.js
@@ -46,18 +46,13 @@ const useStyles = makeStyles(() => {
         lineHeight: 1.5,
       },
 
-      // Display proper padding and border inside the list
-      "& li:first-child": {
-        paddingTop: "6px",
-      },
       "& li": {
         paddingTop: "14px",
         paddingBottom: "14px",
         borderBottom: "1px solid rgba(0, 0, 0, 0.1)",
       },
       "& li:last-child": {
         borderBottom: "none",
-        paddingBottom: "6px",
       },
     },
     responsiveLeft: {
@@ -66,7 +61,7 @@ const useStyles = makeStyles(() => {
     },
     currentValue: {
       display: "flex",
-      paddingLeft: "40px",
+      paddingRight: 24,
     },
     infoButton: {
       position: "absolute",