Merge pull request #105 from cu-mkp/dev

Fixing watermark pane width and glossary scroll
cu-mkp · Apr 23, 2024 · fcf9234 · fcf9234
2 parents a54daa2 + a892f4b
commit fcf9234
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/editioncrafter-umd/package.json b/editioncrafter-umd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cu-mkp/editioncrafter-umd",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "homepage": "https://cu-mkp.github.io/editioncrafter/",
   "description": "A simple digital critical edition publication tool",
   "private": false,

diff --git a/editioncrafter/package.json b/editioncrafter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cu-mkp/editioncrafter",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "A simple digital critical edition publication tool",
   "homepage": "https://cu-mkp.github.io/editioncrafter/",
   "private": false,

diff --git a/editioncrafter/src/component/Watermark.js b/editioncrafter/src/component/Watermark.js
@@ -3,7 +3,7 @@ import Navigation from './Navigation';
 import Pagination from './Pagination';
 
 const Watermark = ({ side, documentView, documentViewActions }) => (
-  <div style={{ position: "relative" }}>
+  <div style={{ position: "relative" }} className="watermarkContainer">
     { documentView.left.iiifShortID !== '-1' && documentView.right.iiifShortID !== '-1'
       ? <Navigation side={side} documentView={documentView} documentViewActions={documentViewActions} />
       : null}

diff --git a/editioncrafter/src/scss/_glossary.scss b/editioncrafter/src/scss/_glossary.scss
@@ -1,7 +1,6 @@
 #glossaryView {
 
 	#glossaryViewInner {
-		overflow-y: scroll;
 		margin: 5px 0 0 0;
 		@include md {
 			margin: 52px 0 0 0;

diff --git a/editioncrafter/src/scss/_watermark.scss b/editioncrafter/src/scss/_watermark.scss
@@ -1,12 +1,16 @@
 $watermark-size: max(10rem, 160px);
 
+.watermarkContainer .navigationComponent {
+	position: absolute;
+}
+
 .watermark{
 	width:100%;
 	height:100%;
-	margin: calc(50vh - (#{$watermark-size}/2)) auto 0 auto;
+	margin: calc(50% - (#{$watermark-size}/2)) auto 0 auto;
 }
 .transcriptContent .watermark{
-   margin: calc(50vh - (25rem/2)) auto 0 auto;
+   margin: calc(50% - (25rem/2)) auto 0 auto;
 }
 
 .watermark_contents{