gs-ir: DocZonesShowDetails: fixed bad modal display

genericsystem · Sep 20, 2017 · 6d7ca09 · 6d7ca09
1 parent af2982a
commit 6d7ca09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/gs-ir/src/main/java/org/genericsystem/ir/app/gui/pages/DocZonesShowDetails.java b/gs-ir/src/main/java/org/genericsystem/ir/app/gui/pages/DocZonesShowDetails.java
@@ -19,10 +19,11 @@
 @StyleClass(path = { FlexDiv.class, FiltersDiv.class }, value = "filter-results")
 @Style(path = FlexDiv.class, name = "display", value = "block")
 @Style(path = FlexDiv.class, name = "padding", value = "1.5em")
+@Style(path = FlexDiv.class, name = "max-height", value = "fit-content")
+@Style(path = FlexDiv.class, name = "width", value = "inherit")
 public class DocZonesShowDetails extends ModalWithDisplay {
 
 	@FlexDirectionStyle(FlexDirection.ROW)
-	@StyleClass("ocr-row")
 	@Children({ FilterNames.class, FiltersOcrText.class })
 	@ForEach(OCR_SELECTOR.class)
 	public static class FiltersDiv extends FlexDiv {
@@ -32,13 +33,15 @@ public static class FiltersDiv extends FlexDiv {
 	@FlexDirectionStyle(FlexDirection.COLUMN)
 	@BindText
 	@StyleClass({ "ocr", "ocr-label" })
+	@Style(name = "flex", value = "1")
 	public static class FilterNames extends FlexDiv {
 		// Print the filtername
 	}
 
 	@FlexDirectionStyle(FlexDirection.COLUMN)
 	@BindText(OCR_TEXT.class)
 	@StyleClass({ "ocr", "ocr-text" })
+	@Style(name = "flex", value = "1")
 	public static class FiltersOcrText extends FlexDiv {
 		// Print the ocr text for the corresponding filter
 	}

diff --git a/gs-ir/src/main/resources/watchapp.css b/gs-ir/src/main/resources/watchapp.css
@@ -94,11 +94,6 @@ button {
 	width: auto;
 }
 
-.ocr-row {
-	width: 90%;
-	margin: auto;
-}
-
 .ocr {
 	margin: 0.2em 0.5em;
 }