From 910e78c4f4a1ce3ad54caa4201f557108f64f903 Mon Sep 17 00:00:00 2001 From: Chris Beer <cabeer@stanford.edu> Date: Thu, 7 Feb 2019 13:44:43 -0800 Subject: [PATCH] Expect the mirador viewer to get injected into a container that is sized appropriately --- __tests__/integration/mirador/index.html | 2 +- __tests__/integration/mirador/plugins.html | 2 +- src/styles/index.scss | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/__tests__/integration/mirador/index.html b/__tests__/integration/mirador/index.html index 46a2a53a1..5c097b293 100644 --- a/__tests__/integration/mirador/index.html +++ b/__tests__/integration/mirador/index.html @@ -7,7 +7,7 @@ <title>Mirador</title> </head> <body> - <div id="mirador"></div> + <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <script>document.write("<script type='text/javascript' src='../../../dist/mirador.min.js?v=" + Date.now() + "'><\/script>");</script> <script type="text/javascript"> var miradorInstance = Mirador.viewer({ diff --git a/__tests__/integration/mirador/plugins.html b/__tests__/integration/mirador/plugins.html index df5ddbd9e..3310af53b 100644 --- a/__tests__/integration/mirador/plugins.html +++ b/__tests__/integration/mirador/plugins.html @@ -7,7 +7,7 @@ <title>Mirador</title> </head> <body> - <div id="mirador"></div> + <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div> <script src="../../../node_modules/react/umd/react.development.js"></script> <!-- Request from CDN if unavailable locally --> <script type="text/javascript"> diff --git a/src/styles/index.scss b/src/styles/index.scss index c7932e0ad..cd70bf40f 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1,6 +1,12 @@ @import 'variables'; .mirador { + &-app { + height: 100%; + position: relative; + width: 100%; + } + &-workspace { bottom: 0; box-sizing: border-box; -- GitLab