From 5298430971c4fec0d00b8afeb834e919dccb684d Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Tue, 22 Sep 2020 10:19:42 +0100
Subject: [PATCH] Tidied up mini stream formatting

---
 .../modalComponents/calibrationModal.vue          |  1 -
 .../viewComponents/miniStreamDisplay.vue          |  1 +
 .../settingsComponents/cameraSettings.vue         |  1 -
 .../cameraStageMappingSettings.vue                | 15 ++++++++++++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/openflexure_microscope/api/static/src/components/modalComponents/calibrationModal.vue b/openflexure_microscope/api/static/src/components/modalComponents/calibrationModal.vue
index 5383eca4..2dfcd53e 100644
--- a/openflexure_microscope/api/static/src/components/modalComponents/calibrationModal.vue
+++ b/openflexure_microscope/api/static/src/components/modalComponents/calibrationModal.vue
@@ -313,6 +313,5 @@ export default {
   width: 75%;
   margin-left: auto;
   margin-right: auto;
-  border: 1px solid #555;
 }
 </style>
diff --git a/openflexure_microscope/api/static/src/components/viewComponents/miniStreamDisplay.vue b/openflexure_microscope/api/static/src/components/viewComponents/miniStreamDisplay.vue
index 5a14b5c7..01ba9092 100644
--- a/openflexure_microscope/api/static/src/components/viewComponents/miniStreamDisplay.vue
+++ b/openflexure_microscope/api/static/src/components/viewComponents/miniStreamDisplay.vue
@@ -43,6 +43,7 @@ export default {
 .stream-display img {
   text-align: center;
   object-fit: contain;
+  border: 1px solid #555;
 }
 
 .stream-display {
diff --git a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/cameraSettings.vue b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/cameraSettings.vue
index 740785a6..5d1c7da9 100644
--- a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/cameraSettings.vue
+++ b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/cameraSettings.vue
@@ -146,6 +146,5 @@ export default {
   margin-left: auto;
   margin-right: auto;
   margin-top: 50px;
-  border: 1px solid #555;
 }
 </style>
diff --git a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/cameraStageMappingSettings.vue b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/cameraStageMappingSettings.vue
index 26dbf50e..2a3c3e6e 100644
--- a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/cameraStageMappingSettings.vue
+++ b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/cameraStageMappingSettings.vue
@@ -27,19 +27,25 @@
         Download calibration data
       </button>
     </form>
+
+    <div id="mini-stream">
+      <miniStreamDisplay />
+    </div>
   </div>
 </template>
 
 <script>
 import axios from "axios";
 import taskSubmitter from "../../genericComponents/taskSubmitter";
+import miniStreamDisplay from "../miniStreamDisplay.vue";
 
 // Export main app
 export default {
   name: "CameraStageMappingSettings",
 
   components: {
-    taskSubmitter
+    taskSubmitter,
+    miniStreamDisplay
   },
 
   props: {
@@ -167,4 +173,11 @@ export default {
   margin-left: auto;
   margin-right: auto;
 }
+#mini-stream {
+  width: 500px;
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
 </style>