Merge remote-tracking branch 'origin/master' into test-server-changes

css/components/form-textarea.css

@@ -17,7 +17,7 @@ textarea {
   padding: var(--sp);
 }
 .region--sidebar input.form-text {
-  width: 14em;
+  max-width: 14em;
 }
 .region--sidebar .advanced-search-form {
   input.form-text {

css/components/header-buttons-mobile.css

@@ -28,14 +28,14 @@
 }
 
 /* @media ((((min-width: 60rem)))) { */
-@media ((((min-width: 55rem)))) {
+@media ((((min-width: 1250px)))) {
   .mobile-buttons {
     margin-block-start: var(--sp6);
   }
 }
 
 /* @media ((((min-width: 60rem)))) { */
-@media ((((min-width: 55rem)))) {
+@media ((((min-width: 1250px)))) {
   body:not(.is-always-mobile-nav) .mobile-buttons {
     display: none;
   }

css/components/header-navigation.css

@@ -30,14 +30,17 @@
    * mobile navigation needs to slide beneath the button, but we also cannot
    * use padding because that would enable the button to scroll out of the
    * viewport on short screens. */
-  border-block-start: solid var(--color--white) calc(var(--sp3) + var(--drupal-displace-offset-top, 0px));
+  border-block-start: solid var(--color--white)
+    calc(var(--sp3) + var(--drupal-displace-offset-top, 0px));
   background-color: var(--color--white);
   box-shadow: 0 0 72px rgba(0, 0, 0, 0.1);
 }
 
 .header-nav.is-active {
   visibility: visible;
-  transform: translateX(calc(-100% - var(--drupal-displace-offset-right, 0px))); /* LTR */
+  transform: translateX(
+    calc(-100% - var(--drupal-displace-offset-right, 0px))
+  ); /* LTR */
 }
 
 [dir="rtl"] .header-nav.is-active {
@@ -84,7 +87,7 @@ html.js .header-nav {
 }
 
 /* @media ((((min-width: 60rem)))) { */
-@media ((((min-width: 55rem)))) {
+@media ((((min-width: 1250px)))) {
   body:not(.is-always-mobile-nav) .header-nav {
     position: static;
     display: flex;
@@ -113,14 +116,21 @@ html.js .header-nav {
     max-width: calc((7 * (var(--grid-col-width) + var(--grid-gap))));
     padding-inline-end: var(--sp);
     transition: transform 0.2s, visibility 0.2s;
-    border-top-width: calc(var(--drupal-displace-offset-top, 0px) + var(--sp11));
+    border-top-width: calc(
+      var(--drupal-displace-offset-top, 0px) + var(--sp11)
+    );
   }
 }
 
 @media (min-width: 90rem) {
   body.is-always-mobile-nav .header-nav {
-    max-width: calc(100vw - (var(--max-width) + var(--content-left)) + ((7 * (var(--grid-col-width) + var(--grid-gap)))));
+    max-width: calc(
-    padding-inline-end: calc(100vw - (var(--max-width) + var(--content-left) - var(--sp)));
+      100vw - (var(--max-width) + var(--content-left)) +
+        ((7 * (var(--grid-col-width) + var(--grid-gap))))
+    );
+    padding-inline-end: calc(
+      100vw - (var(--max-width) + var(--content-left) - var(--sp))
+    );
   }
 }
 

css/components/islandora_mods.css

@@ -826,3 +826,4 @@ div#block-olivesnews-search {
 .path-frontpage .main-content__container.container {
   padding-top: 4em;
 }
+.search-result.views-row { min-width: 0;}

css/components/navigation/nav-primary-button.css

@@ -15,7 +15,9 @@
   overflow: hidden;
   width: var(--sp2);
   height: var(--sp2);
-  margin-block-start: var(--sp0-5); /* Visually align button with menu link text. */
+  margin-block-start: var(
+    --sp0-5
+  ); /* Visually align button with menu link text. */
   padding-block: 0;
   padding-inline-start: 0;
   padding-inline-end: 0;
@@ -76,7 +78,7 @@
   pointer-events: none;
 }
 
-@media ((((min-width: 60rem)))) {
+@media ((((min-width: 1250px)))) {
   body:not(.is-always-mobile-nav) .primary-nav__button-toggle {
     flex-shrink: 0;
     align-self: stretch;
@@ -91,7 +93,9 @@
     outline: 0;
   }
 
-  body:not(.is-always-mobile-nav) .primary-nav__button-toggle:focus .icon--menu-toggle {
+  body:not(.is-always-mobile-nav)
+    .primary-nav__button-toggle:focus
+    .icon--menu-toggle {
     border: solid 2px var(--color--primary-40);
   }
 
@@ -100,11 +104,15 @@
     color: currentColor;
   }
 
-  body:not(.is-always-mobile-nav) .primary-nav__button-toggle[aria-expanded="true"] .icon--menu-toggle::after {
+  body:not(.is-always-mobile-nav)
+    .primary-nav__button-toggle[aria-expanded="true"]
+    .icon--menu-toggle::after {
     opacity: 0.8;
   }
 
-  body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle {
+  body:not(.is-always-mobile-nav)
+    .primary-nav__button-toggle
+    .icon--menu-toggle {
     inset-inline-start: 0.1875rem;
     width: 1.125rem;
     transform: translateY(-50%);
@@ -112,11 +120,15 @@
     background-color: var(--color--white);
   }
 
-  body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle::before {
+  body:not(.is-always-mobile-nav)
+    .primary-nav__button-toggle
+    .icon--menu-toggle::before {
     content: none;
   }
 
-  body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle::after {
+  body:not(.is-always-mobile-nav)
+    .primary-nav__button-toggle
+    .icon--menu-toggle::after {
     /* stylelint-disable csstools/use-logical */
     top: calc(50% - 2px);
     left: 0.1875rem;

css/components/navigation/nav-primary-wide.css

@@ -10,7 +10,7 @@
  * Nav Primary (wide widths).
  */
 
-@media ((((min-width: 50rem)))) {
+@media ((((min-width: 1250px)))) {
   body:not(.is-always-mobile-nav) .primary-nav__menu-item {
     flex-wrap: nowrap; /* Ensure that sub navigation toggle button doesn't wrap underneath link. */
   }

deploy.sh

@@ -12,7 +12,8 @@
 # --------------------------------------------------------
 
 # --- CONFIGURATION (Edit these for new environments) ---
-SERVER="newspapers2.islandarchives.ca"
+# SERVER="newspapers2.islandarchives.ca"
+SERVER="137.149.52.48"
 THEME_DIR="/var/www/islandnewspapers2/web/themes/custom/olivesnews"
 SITE_ROOT="/var/www/islandnewspapers2/web/sites/islandnewspapers2"
 DRUSH_PATH="/var/www/islandnewspapers2/vendor/drush/drush/drush"

js/nouislider-year-format_v2.js

@@ -0,0 +1,38 @@
+(function (Drupal) {
+  "use strict";
+
+  Drupal.behaviors.nouisliderYearFormat = {
+    attach: function (context) {
+      // 1. Target the slider element
+      const sliderEl = document.getElementById("year");
+      if (!sliderEl) return;
+
+      // 2. Use a small function to attach the rounding logic
+      const applyRounding = () => {
+        if (sliderEl.noUiSlider && !sliderEl.dataset.yearFormatApplied) {
+          sliderEl.dataset.yearFormatApplied = "true";
+
+          sliderEl.noUiSlider.on("update", function (values, handle) {
+            const inputId =
+              handle === 0 ? "nouislider-input-from" : "nouislider-input-to";
+            const input = document.getElementById(inputId);
+            if (input) {
+              // Round the string value ("1971.00" -> 1971)
+              input.value = Math.round(parseFloat(values[handle]));
+            }
+          });
+        }
+      };
+
+      // 3. Try immediately, then periodically until the slider is ready
+      applyRounding();
+      const retry = setInterval(() => {
+        applyRounding();
+        if (sliderEl.dataset.yearFormatApplied) clearInterval(retry);
+      }, 100);
+
+      // Stop trying after 3 seconds
+      setTimeout(() => clearInterval(retry), 3000);
+    },
+  };
+})(Drupal);

olivesnews.libraries.yml

@@ -58,7 +58,7 @@ global-styling:
 
   js:
     js/checkbox.js: {}
-    js/custom.js: {}
+    #js/custom.js: {}
     js/readmore.js: {}
 
   dependencies:
@@ -69,7 +69,7 @@ global-styling:
 
 nouislider-year-format:
   js:
-    js/nouislider-year-format.js: {}
+    js/nouislider-year-format_v2.js: {}
   dependencies:
     - core/drupal