diff --git a/openflexure_microscope/api/static/icons/baseline-camera_alt-24px.svg b/openflexure_microscope/api/static/icons/baseline-camera_alt-24px.svg new file mode 100644 index 00000000..83479645 --- /dev/null +++ b/openflexure_microscope/api/static/icons/baseline-camera_alt-24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/openflexure_microscope/api/static/icons/baseline-settings-20px.svg b/openflexure_microscope/api/static/icons/baseline-settings-20px.svg new file mode 100644 index 00000000..0737ecba --- /dev/null +++ b/openflexure_microscope/api/static/icons/baseline-settings-20px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/openflexure_microscope/api/static/main_v1.js b/openflexure_microscope/api/static/main_v1.js index 26f646d9..c9514f19 100644 --- a/openflexure_microscope/api/static/main_v1.js +++ b/openflexure_microscope/api/static/main_v1.js @@ -44,6 +44,14 @@ window.onload = function() { getCaptures() } + +// Cosmetic methods +function toggleClassToDiv(div_id, class_name) { + document.getElementById(div_id).classList.toggle(class_name) +} + +// Microscope methods + function deleteCapture(capture_id) { function deleteCaptureCallback(response, status) { console.log(status); diff --git a/openflexure_microscope/api/static/style_v1.css b/openflexure_microscope/api/static/style_v1.css index eddbdf29..9c26272c 100644 --- a/openflexure_microscope/api/static/style_v1.css +++ b/openflexure_microscope/api/static/style_v1.css @@ -25,29 +25,55 @@ body { .left, .right { background-color: #f4f4f4; overflow-y: scroll; + flex: 0; + flex-shrink: 0; + flex-basis: 250px; + -webkit-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; } .left{ - width: 220px; float: left; } -.Right{ - width: 280px; +.right{ float: right; } +.hidden{ + flex-basis: 0; + padding:0 +} + .middle { - margin-left: 220px; - margin-right: 280px; + position: relative; + flex-grow: 1; background-color: #d3d3d3; } +#left-sb-btn { + left: 20px; +} + +#right-sb-btn { + right: 20px; +} + +.sb-btn { + top: 20px; + position: absolute; +} + +.sb-btn button{ + width: 40px; + height: 40px; + margin: 0; + padding:5px; +} + /* Clear floats after the columns */ -.row:after { - content: ""; - display: table; - clear: both; +.row{ + display: flex; } /* Flexboxes */ diff --git a/openflexure_microscope/api/templates/index_v1.html b/openflexure_microscope/api/templates/index_v1.html index a52c2c9e..5529cd5f 100644 --- a/openflexure_microscope/api/templates/index_v1.html +++ b/openflexure_microscope/api/templates/index_v1.html @@ -5,11 +5,13 @@ + +
-
+

Settings

Position

@@ -71,7 +73,21 @@
-
+
+
+ +
+
+ +
+ +
+ +

Capture

Filename:

@@ -90,10 +106,6 @@
-
- -
-