From dd8f1e496f97efb8acf019c2f3a866b0aad48d73 Mon Sep 17 00:00:00 2001
From: rdrew <rdrew@upei.ca>
Date: Fri, 7 Mar 2025 09:28:10 -0400
Subject: [PATCH] miradow conflict fix

---
 css/components/unsorted.css                | 12 ++++++++++++
 js/{mirador-mods.js => mirador-mods.js.bk} |  0
 olivesimagined.libraries.yml               |  5 -----
 olivesimagined.theme                       |  3 +++
 4 files changed, 15 insertions(+), 5 deletions(-)
 rename js/{mirador-mods.js => mirador-mods.js.bk} (100%)

diff --git a/css/components/unsorted.css b/css/components/unsorted.css
index 3803644..3bf1518 100755
--- a/css/components/unsorted.css
+++ b/css/components/unsorted.css
@@ -47,3 +47,15 @@
     border: 1px solid #ccc;
   }
 }
+.text-content.clearfix.field.field--name-field-table-of-contents.field--type-text-long.field--label-hidden.field__item {
+	font-family: revert;
+	line-height: 1;
+	margin-top: 5px;
+	font-size:1rem;
+}
+.mirador80 {
+	    display: none !important;
+    }
+.mirador-companion-area-far-bottom {
+	    display: none !important;
+    }
diff --git a/js/mirador-mods.js b/js/mirador-mods.js.bk
similarity index 100%
rename from js/mirador-mods.js
rename to js/mirador-mods.js.bk
diff --git a/olivesimagined.libraries.yml b/olivesimagined.libraries.yml
index c4d00e7..22e33aa 100755
--- a/olivesimagined.libraries.yml
+++ b/olivesimagined.libraries.yml
@@ -75,11 +75,6 @@ cke-dialog:
     component:
       css/components/cke-dialog.css: {}
 
-mirador-mods:
-  version: VERSION
-  js:
-    js/mirador-mods.js: {}
-    
 color-picker:
   version: VERSION
   css:
diff --git a/olivesimagined.theme b/olivesimagined.theme
index b8e65c0..22a9358 100755
--- a/olivesimagined.theme
+++ b/olivesimagined.theme
@@ -728,3 +728,6 @@ function olivesimagined_preprocess_mirador(&$variables) {
   ]);
 }
  */
+function olivesimagined_preprocess_mirador(&$variables) {
+  $variables['window_config']['allowClose'] = FALSE;
+}