Merge branch 'io-118' into test

oslokommune · Nov 22, 2023 · 748ed38 · 748ed38
2 parents 1075551 + 95af348
commit 748ed38
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/components/map/map.html b/src/components/map/map.html
@@ -110,7 +110,7 @@ <h2 class="ods-devtools-text-preset-1">Single marker with automatic popup and ra
       <h2 class="ods-devtools-text-preset-1">Markers with clustering</h2>
       <div class="ods-devtools-code">
         <div class="ods-map" id="ods-map2">
-          <ods-map ref="odsMap2" api-key="VW1Tn0fx1t3b6t0CHP6Q" :state="{ longitude: 10.74981, latitude: 59.913008, zoom: 10, autoFitToBounds: true, showPopups: true }" geo-json="https://ukeweb-public.s3.dualstack.eu-central-1.amazonaws.com/map/data/kindergarten-with-events.geojson" :clustered-points="true" />
+          <ods-map ref="odsMap2" api-key="VW1Tn0fx1t3b6t0CHP6Q" :state="{ longitude: 10.74981, latitude: 59.913008, zoom: 10, autoFitToBounds: true, showPopups: true }" geo-json="https://ukeweb-public.s3.dualstack.eu-central-1.amazonaws.com/map/data/kindergarten-with-events-ods.geojson" :clustered-points="true" />
         </div>
       </div>
     </div>
@@ -141,7 +141,7 @@ <h2 class="ods-devtools-text-preset-2">Markers with clustering</h2>
     </div>
     <div class="ods-grid__column--12">
       <div class="ods-map" id="ods-map5">
-        <ods-map ref="odsMap5" api-key="VW1Tn0fx1t3b6t0CHP6Q" :state="{ longitude: 10.74981, latitude: 59.913008, zoom: 10, showPopups: true, autoFitToBounds: true }" geo-json="https://ukeweb-public.s3.dualstack.eu-central-1.amazonaws.com/map/data/kindergarten-with-events.geojson" :clustered-points="true" ratio="ods-ratio-1-1 ods-ratio-21-9-breakpoint-medium" />
+        <ods-map ref="odsMap5" api-key="VW1Tn0fx1t3b6t0CHP6Q" :state="{ longitude: 10.74981, latitude: 59.913008, zoom: 10, showPopups: true, autoFitToBounds: true }" geo-json="https://ukeweb-public.s3.dualstack.eu-central-1.amazonaws.com/map/data/kindergarten-with-events-ods.geojson" :clustered-points="true" ratio="ods-ratio-1-1 ods-ratio-21-9-breakpoint-medium" />
       </div>
     </div>
     <div class="ods-grid__column--12">

diff --git a/src/components/map/map.scss b/src/components/map/map.scss
@@ -20,13 +20,18 @@
 
   &__popup-content {
     @extend %ods-text--size-kilo;
-    @extend %ods-padding-4;
+    @extend %ods-padding-horizontal-4, %ods-padding-bottom-4, %ods-padding-top-2, %ods-padding-top-3-breakpoint-large;
   }
 
   &__heading {
-    @extend %ods-text--size-juliett, %ods-text--size-india-breakpoint-medium, %ods-text--size-hotel-breakpoint-large;
-    @extend %ods-text--weight-medium;
-    @extend %ods-margin-bottom-3;
+    @extend %ods-text--size-india-breakpoint-medium, %ods-text--size-hotel-breakpoint-large;
+
+    &:not(:last-child) {
+      @extend %ods-padding-vertical-2, %ods-padding-vertical-3-breakpoint-large;
+
+      overflow-wrap: break-word;
+      hyphens: auto;
+    }
   }
 
   &__label {
@@ -43,13 +48,6 @@
   @include breakpoints.large {
     padding: 1.75rem 0 0;
   }
-
-  h2:not(:last-child) {
-    overflow-wrap: break-word;
-    hyphens: auto;
-    @extend %ods-padding-vertical-2, %ods-padding-vertical-3-breakpoint-large;
-  }
-
 }
 
 .maplibregl-popup-close-button {