Merge pull request #639 from camicroscope/develop

For 3.10.2
camicroscope · Jun 16, 2023 · c14569f · c14569f
2 parents 8760469 + 2293839
commit c14569f
Show file tree

Hide file tree

Showing 29 changed files with 947 additions and 242 deletions.
diff --git a/Caracal b/Caracal
diff --git a/Distro b/Distro
diff --git a/HISTORY.md b/HISTORY.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Index
 * **Version 3**
+    * [3.10.x](#camicroscope-3100)
     * [3.9.x](#camicroscope-390)
     * [3.8.x](#camicroscope-380)
     * [3.7.x](#camicroscope-377)
@@ -24,25 +25,54 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * **Version 1**
     * [1.0.x](#camicroscope-10)
 
-### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.9.10...camicroscope:develop)
+### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.10.2...camicroscope:develop)
 ###### TBD
 
+### caMicroscope [3.10.2](https://github.com/camicroscope/camicroscope/compare/v3.10.1...camicroscope:v3.10.2)
+###### 2023-06-16
+* point to point
+* Fixed Workbench Navbar Overlapping  #580
+* The Reload button is not Responsive for small size devices #579
+* style: art Fixed fat hamburger icon & alignment issues of dropdown issue#596 #597
+* Styled export.html  #601
+* fix: bug Responsiveness issues of workbench section #605 #605
+* Slight spelling mistake caught while browsing code #630
+* Adding Footer to Sign Up Page #635
+* Fixed the UI of admin page: Solved issue #621 #620
+* Fixed spelling mistake #614
+* FIXED Overlapping / Not properly styled on class=card in the workbench.html #616
+* Fixed import.html interface #613
+
+### caMicroscope [3.10.1](https://github.com/camicroscope/camicroscope/compare/v3.10.0...camicroscope:v3.10.1)
+###### 2022-11-18
+* Bugfix for Magnifying glass with slide token auth
+
+### caMicroscope [3.10.0](https://github.com/camicroscope/camicroscope/compare/v3.9.11...camicroscope:v3.10.0)
+###### 2022-10-25
+* Result Export Page [caMicroscope/566](https://github.com/camicroscope/caMicroscope/pull/566)
+* Slide Token injection [caMicroscope/567](https://github.com/camicroscope/caMicroscope/pull/567)
+
+
 ### caMicroscope [3.9.11](https://github.com/camicroscope/camicroscope/compare/v3.9.10...camicroscope:v3.9.11)
 ###### 2021-01-20
 * add redir page/app
 
 ### caMicroscope [3.9.10](https://github.com/camicroscope/camicroscope/compare/v3.9.9...camicroscope:v3.9.10)
 ###### 2021-01-20
-
+* pathdb mode improvements
 
 ### caMicroscope [3.9.9](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:v3.9.9)
 ###### 2021-11-08
 * Fix and enhance Human Readable URL support
 
-### caMicroscope [3.9.10](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:v3.9.10)
+### caMicroscope [3.9.10](https://github.com/camicroscope/camicroscope/compare/v3.9.9...camicroscope:v3.9.10)
 ###### 2021-01-20
 * Human Readable Urls for pathdb
 
+### caMicroscope [3.9.9](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:v3.9.9)
+###### 2021-11-08
+* Fix and enhance Human Readable URL support
+
 ### caMicroscope [3.9.8](https://github.com/camicroscope/camicroscope/compare/v3.9.6...camicroscope:v3.9.8)
 ###### 2021-10-21
 * Add Segmentation -> Annotation Functionality [#542](https://github.com/camicroscope/caMicroscope/pull/542)

diff --git a/apps/Info.html b/apps/Info.html
@@ -59,7 +59,7 @@
 					<span class="navbar-toggler-icon"></span>
 					</button>
 					<div class="collapse navbar-collapse" id="navbarSupportedContent" >
-						<ul class="navbar-nav mr-auto">
+						<ul class="navbar-nav mr-auto gap-1">
 							<li class="nav-item link" style="font-family: sans-serif;">
 							   <a class="nav-link" href="landing/landing.html"> <i class="fas fa-home"></i> Home</a>
 							</li>

diff --git a/apps/admin/admin.css b/apps/admin/admin.css
@@ -49,6 +49,8 @@ iframe {
 .sidebar .nav-link {
   font-weight: 500;
   color: #5c5c5c;
+  font-size: 15px;
+  margin-bottom:5px
 }
 .sidebar .nav-link.active {
   font-weight: bold;
@@ -86,6 +88,9 @@ iframe {
   font-size: 1rem;
   background-color: rgba(0, 0, 0, 0.25);
   box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25);
+  height: 60px;
+  background-color: #007bff;
+
 }
 
 .navbar .navbar-toggler {
@@ -111,18 +116,55 @@ iframe {
 }
 
 .title-icon {
-  background-image: url("../../favicon.ico");
+  background-image: url("./favicon_without_bg.png");
   background-repeat: no-repeat;
-  background-size: 3rem 3rem;
+  background-size: 4rem 3.8rem;
+  padding-bottom: 2px;
 }
 
 .title-txt {
   font-weight: bold;
   margin-left: 3rem;
+  font-size: 1.5rem;
+  padding-left: 12px;
 }
 .nav-link {
   cursor: pointer;
 }
+
 .nav-link:hover{
- background-color: #dfdfdf;
+  background-color: transparent;
+  border:2px solid #fff;
+  width: 100%;
+  opacity: 1;
+  padding: 10px;
+  border-radius: 5px;
+  font-weight: bold;
+}
+
+@media (max-width: 767.98px) {
+  .sidebar {
+    top: 2rem;
+  }
+  .sign{
+    text-align: center;
+    margin: auto;
+    padding: auto;
+  }
+  .nav-link:hover{
+    padding: 5px;
+    margin-top: 3px;
+    margin-bottom: 3px;
+    border:2px solid #fff;
+
+  }
+}
+
+.sign-text{
+  color: #fff !important;
+  font-weight: 500px;
 }
+.sign-text:hover{
+  color: #000 !important;
+  background-color: #fff
+}
diff --git a/apps/admin/admin.html b/apps/admin/admin.html
@@ -37,7 +37,7 @@
     <meta name="theme-color" content="#7952b3" />
 
     <style></style>
-    <title>CaMicroScope Bashboard</title>
+    <title>caMicroscope Dashboard</title>
   </head>
   <body>
     <header
@@ -63,9 +63,9 @@
         <span class="navbar-toggler-icon"></span>
       </button>
       <!-- <input class="form-control form-control-primary w-100" type="text" placeholder="Search" aria-label="Search"> -->
-      <ul class="navbar-nav px-3">
+      <ul class="navbar-nav px-3 sign">
         <li class="nav-item text-nowrap">
-          <a class="nav-link" href="#">Sign out</a>
+          <a class="nav-link sign-text" href="#">Sign out</a>
         </li>
       </ul>
     </header>

diff --git a/apps/admin/favicon_without_bg.png b/apps/admin/favicon_without_bg.png
diff --git a/apps/dev-workbench/workbench.css b/apps/dev-workbench/workbench.css
@@ -18,8 +18,9 @@
 .btn {
   text-transform: unset !important;
 }
-.navbar {
-  padding-left: 20px;
+.nabvar {
+  display: flex;
+  flex-direction: row;
 }
 .navbar-brand{
   margin-right: 10rem !important;
@@ -38,3 +39,23 @@
 #toastPlaceholder {
   display: none;
 }
+
+
+#goBack{
+  display: flex;
+  margin: 0 1rem;
+}
+@media only screen and (max-width: 551px) {
+  nav {
+    flex-direction: column;
+  }
+
+  nav ul {
+    flex-direction: column;
+  }
+
+  nav ul li {
+    margin: 10px 0;
+  }
+}
+
diff --git a/apps/dev-workbench/workbench.html b/apps/dev-workbench/workbench.html
@@ -64,19 +64,32 @@
   <body>
     <!--Navbar-->
     <nav
-      class="navbar navbar-expand-lg navbar-dark"
+      class="navbar navbar-expand-lg navbar-dark flex-row px-2"
       style="background: rgb(33, 37, 41);"
     >
       <div style="cursor: pointer;" id="goBack">
         <i data-feather="arrow-left" class="text-white"></i>
       </div>
 
+<<<<<<< HEAD
+      <!-- Navbar brand --> 
+
+      <div class="navbar-brand-div flex-grow-1">
+        <span style="cursor: default" class="navbar-brand " > Workbench</span>
+
+      </div>
+      <div>
+
+
+      <ul class="navbar-nav mr-auto px-2">
+=======
       <!-- Navbar brand -->
       <span style="cursor: default;" class="navbar-brand"> Workbench</span>
       <ul class="navbar-nav mr-auto">
+>>>>>>> master
         <!-- Dropdown -->
         <li
-          style="position: absolute; right: 2em; margin-top: -1.3em;"
+
           class="nav-item dropdown"
         >
           <a
@@ -88,7 +101,7 @@
             >Options</a
           >
           <div
-            style="margin-left: -3em;"
+            style="margin-left: -5em;"
             class="dropdown-menu dropdown-primary"
             aria-labelledby="navbarDropdownMenuLink"
           >
@@ -112,6 +125,8 @@
               <i class="fas fa-question-circle"></i>
               &nbsp;&nbsp;Help/User Guide</a
             >
+            </div>
+
           </div>
         </li>
       </ul>
@@ -224,7 +239,7 @@
         "
       >
         <!-- Cards -->
-        <div class="card" style="max-width: 20em; margin: 0 auto;">
+        <div class="card" style="max-width: 20em; margin-left:2cm; auto;">
           <!-- Card content -->
           <div class="card-body">
             <!-- Title -->
@@ -253,10 +268,10 @@ <h4 class="card-title">Select your dataset</h4>
             </div>
           </div>
         </div>
-        <div style="height: 13em; padding: 6em 0; font-size: large;">
+        <div style="height: 1em; margin-left:5cm; padding: 2em 0; font-size: large;">
           <b> OR</b>
         </div>
-        <div class="card" style="max-width: 20em; margin: 0 auto;">
+        <div class="card" style="max-width: 20em; margin-left:2cm; auto;">
           <!-- Card content -->
           <div class="card-body">
             <!-- Title -->

diff --git a/apps/landing/landing.html b/apps/landing/landing.html
@@ -40,7 +40,7 @@
             <span class="navbar-toggler-icon"></span>
             </button>
             <div class="collapse navbar-collapse" id="navbarSupportedContent" >
-                <ul class="navbar-nav mr-auto">
+                <ul class="navbar-nav mr-auto gap-1">
                     <li class="nav-item active link" style="font-family: sans-serif;">
                        <a class="nav-link" href="landing.html"> <i class="fas fa-home"></i> Home</a>
                     </li>
@@ -118,7 +118,7 @@ <h3>Documentation</h3>
 
 
 
-            <section class="about">
+            <section class="about" style="margin-left:0cm">
 
                 U24 CA18092401A1, <b>Tools to Analyze Morphology and Spatially Mapped Molecular Data</b>
             </section>

diff --git a/apps/landing/main.css b/apps/landing/main.css
@@ -1670,7 +1670,6 @@
 		display: inline-block;
 		font-size: 0.8em;
 		font-weight: 700;
-		height: 3.25em;
 		line-height: 3.35em;
 		padding: 0 2em;
 		text-align: center;
@@ -4741,9 +4740,7 @@
 			transition: background 0.5s; 
 			border-radius: 3px;
 		}
-		nav li:not(:first-child){
-			margin-left: 0.3em !important;
-		}
+
 		nav li:not(.active):hover{
 			background: white;
 		}
@@ -4762,4 +4759,24 @@
 		.fas {
 			/* color: rgba(255,255,255,.5);; */
 			color: inherit;
+		}
+
+		/* Custom Scrollbar */
+
+		::-webkit-scrollbar {
+			width: 12px;
+		  }
+
+		::-webkit-scrollbar-track {
+		box-shadow: inset 0 0 1px grey; 
+		border-radius: 0px;
+		}
+
+		::-webkit-scrollbar-thumb {
+		background: #9a2ca0; 
+		border-radius: 5px;
+		}
+
+		::-webkit-scrollbar-thumb:hover {
+		background: grey;
 		}