Merge branch 'main' into rosado/NOJIRA-source-start-date-fix

digital-land · Dec 16, 2024 · e1728e5 · e1728e5
2 parents 159b9bc + 2744c74
commit e1728e5
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 15 deletions.
diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss
@@ -2,6 +2,7 @@ $govuk-global-styles: true;
 
 @import "node_modules/govuk-frontend/dist/govuk/all";
 @import "node_modules/@x-govuk/govuk-prototype-components/x-govuk/all";
+@import "node_modules/maplibre-gl/dist/maplibre-gl";
 @import "src/assets/scss/_scrollable-container.scss";
 @import "./step-by-step-nav.scss";
 @import "./overrides";
@@ -25,8 +26,6 @@ $govuk-global-styles: true;
     white-space: normal;
     min-width: fit-content;
   }
-
-
 }
 
 .app-inset-text---warning {
@@ -42,9 +41,8 @@ $govuk-global-styles: true;
     color: govuk-colour('blue');
     font-weight: bold;
   }
-
-
 }
+
 .app-map {
   height: 500px;
   @include govuk-responsive-margin(6, $direction: "bottom");
@@ -179,7 +177,6 @@ code * {
   padding: 0px;
 }
 
-
 .dl-table {
   overflow-y: auto;
   overflow-x: hidden;
@@ -193,7 +190,6 @@ code * {
   }
 }
 
-
 .dl-table__head {
   position: sticky;
   top: 0;
@@ -205,7 +201,6 @@ code * {
   }
 }
 
-
 .dl-table__header {
   border: 1px solid $govuk-border-colour;
   text-wrap: nowrap;

diff --git a/src/views/check/results/errors.html b/src/views/check/results/errors.html
@@ -95,7 +95,6 @@ <h3 class="govuk-heading-m">How to improve the data</h3>
 {% block scripts %}
   {{ super() }}
   {% if options.geometries %}
-    <link href='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.css' rel='stylesheet' />
     <script>
       window.serverContext = {
         containerId: 'map',

diff --git a/src/views/check/results/no-errors.html b/src/views/check/results/no-errors.html
@@ -101,7 +101,6 @@ <h3 class="govuk-heading-m">Before you continue</h3>
 {% block scripts %}
   {{ super() }}
   {% if options.geometries %}
-    <link href='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.css' rel='stylesheet' />
     <script>
       window.serverContext = {
         containerId: 'map',

diff --git a/src/views/organisations/dataset-overview.html b/src/views/organisations/dataset-overview.html
@@ -202,7 +202,6 @@ <h2 class="govuk-heading-m">Dataset actions</h2>
 {% block scripts %}
   {{ super() }}
   {% if showMap %}
-    <link href='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.css' rel='stylesheet' />
     <script>
       window.serverContext = {
         containerId: 'map',

diff --git a/src/views/organisations/issueDetails.html b/src/views/organisations/issueDetails.html
@@ -99,7 +99,6 @@ <h3 class="govuk-heading-m">
 {% block scripts %}
   {{ super() }}
   {% if entry.geometries and entry.geometries.length %}
-    <link href='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.css' rel='stylesheet' />
     <script>
       window.serverContext = {
         containerId: 'map',

diff --git a/src/views/organisations/issueTable.html b/src/views/organisations/issueTable.html
@@ -67,8 +67,6 @@
         aria-label="Static map showing {{dataset.name}} for {{organisation.name}}.">
       </div>
     {% endif %}
-
-
   </div>
 </div>
 
@@ -109,7 +107,6 @@ <h3 class="govuk-heading-m">
 {% block scripts %}
   {{ super() }}
   {% if geometries and geometries.length %}
-    <link href='https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.css' rel='stylesheet' />
     <script>
       window.serverContext = {
         containerId: 'map',
@@ -119,4 +116,4 @@ <h3 class="govuk-heading-m">
     </script>
     <script src="/public/js/map.bundle.js"></script>
   {% endif %}
-{% endblock %}
+{% endblock %}