Merge pull request #108 from cu-mkp/dev

Another round of styling tweaks
cu-mkp · Apr 24, 2024 · b393c2a · b393c2a
2 parents bce5833 + bce4c61
commit b393c2a
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 8 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.11",
+  "version": "0.2.12",
   "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.11",
+  "version": "0.2.12",
   "description": "A simple digital critical edition publication tool",
   "homepage": "https://cu-mkp.github.io/editioncrafter/",
   "private": false,

diff --git a/editioncrafter/src/component/ImageGridView.js b/editioncrafter/src/component/ImageGridView.js
@@ -98,7 +98,10 @@ class ImageGridView extends React.Component {
   }
 
   onSelectDoc = (event) => {
-    if (event.target.value !== 'none') {
+    if (!event.target.value || event.target.value == 0) {
+      return;
+    }
+    if (event.target.value && event.target.value !== 'none') {
       this.setState({ ...this.state, currentDoc: event.target.value });
     } else {
       this.setState({ ...this.state, currentDoc: null });

diff --git a/editioncrafter/src/component/Navigation.js b/editioncrafter/src/component/Navigation.js
@@ -29,7 +29,7 @@ const Navigation = (props) => {
   };
 
   const changeType = (event) => {
-    if (event.target.value === undefined) return;
+    if (event.target.value === undefined || event.target.value === 0) return;
     props.documentViewActions.changeTranscriptionType(
       props.side,
       event.target.value,
@@ -353,14 +353,14 @@ const Navigation = (props) => {
               onClick={changeType}
             >
               {Object.keys(props.document.folios.find((fol) => (fol.id == props.documentView[props.side].iiifShortID)).annotationURLs).map(ttKey => (
-                <MenuItem value={ttKey} key={ttKey}>{props.document.variorum ? props.document.transcriptionTypes[props.document.folios.find((fol) => (fol.id == props.documentView[props.side].iiifShortID)).doc_id][ttKey] : props.document.transcriptionTypes[ttKey]}</MenuItem>
+                <MenuItem value={ttKey} key={ttKey} title={ttKey}>{props.document.variorum ? props.document.transcriptionTypes[props.document.folios.find((fol) => (fol.id == props.documentView[props.side].iiifShortID)).doc_id][ttKey] : props.document.transcriptionTypes[ttKey]}</MenuItem>
               ))}
               <MenuItem value="f" key="f">
                 {DocumentHelper.transcriptionTypeLabels.f}
               </MenuItem>
-              <MenuItem value="glossary" key="glossary">
+              { props.glossary && <MenuItem value="glossary" key="glossary">
                 {DocumentHelper.transcriptionTypeLabels.glossary}
-              </MenuItem>
+              </MenuItem> }
             </Select>
             <span
               title="Toggle folio help"

diff --git a/editioncrafter/src/scss/_imageGridView.scss b/editioncrafter/src/scss/_imageGridView.scss
@@ -6,6 +6,11 @@
 	max-height: 100dvh;
 }
 
+.imageGridComponent .thumbnail {
+	background-color: inherit;
+	border: none;
+}
+
 .imageGridComponent > ul {
 	display: flex;
 	flex-wrap: wrap;

diff --git a/editioncrafter/src/scss/_singlePaneView.scss b/editioncrafter/src/scss/_singlePaneView.scss
@@ -0,0 +1,9 @@
+.single-pane-view {
+    height: 100%;
+    width: 100%;
+    overflow: auto;
+}
+
+.single-pane-view > div {
+    height: 100%;
+}
diff --git a/editioncrafter/src/scss/editioncrafter.scss b/editioncrafter/src/scss/editioncrafter.scss
@@ -108,4 +108,5 @@ animation: #{$str};
 
 @import "CETEIcean";
 
-@import "ringSpinner"; 
+@import "ringSpinner"; 
+@import "singlePaneView";