Merge branch 'develop' of https://github.com/camicroscope/camicroscope …

…into develop
camicroscope · Mar 21, 2024 · 214feb6 · 214feb6
2 parents b07912a + 88da32c
commit 214feb6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/apps/segment/segment.css b/apps/segment/segment.css
@@ -28,7 +28,7 @@ input:focus:invalid {
 }
 
 .error{
-    color: yellow;
+    color: red;
 }
 
 .switch {

diff --git a/apps/table.css b/apps/table.css
@@ -87,8 +87,8 @@ nav li:not(.active):hover a {
   color: black !important;
 }
 
-nav li:not(.active):hover{
-	background: white;
+nav li:not(.active):hover {
+  background: white;
 }
 
 .overall {
@@ -100,11 +100,11 @@ nav li:not(.active):hover{
   padding: 0 4px;
 }
 
-.btn2{
-	display: flex;
-	align-items: center;
+.btn2 {
+  display: flex;
+  align-items: center;
 }
-@media screen and (min-width: 480px){
+@media screen and (min-width: 480px) {
   .reload {
     display: block;
   }
@@ -235,3 +235,13 @@ nav li:not(.active):hover{
 .p {
   margin-bottom: 0;
 }
+
+.close {
+  background-color: transparent;
+  border: none;
+}
+
+.close > span {
+  line-height: 1;
+  font-size: 24px;
+}
diff --git a/apps/table.html b/apps/table.html
@@ -217,7 +217,7 @@ <h3>Steps for uploading.</h3>
                                 <ul>
                                     <li>Select the file as Input. The <b>Token</b> field should be filled automatically, and start uploading.</li>
                                     <li> Provide the destination filename with extension.</li>
-                                    <li>Click on the <b><i class="fas fa-arrow-right"></i></b> button to get check a preview of the slide  </li>
+                                    <li>Click on the <b><i class="fas fa-arrow-right"></i></b> button to get a preview of the slide</li>
                                     <li>Finally <b>Finish Upload</b> to post the slide to caMicroscope</li>
                                 </ul>
                             </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ input:focus:invalid { @@
     }
     .error{
-        color: yellow;
+        color: red;
     }
     .switch {
@@ Expand Down @@