Skip to content

Commit c14569f

Browse files
birmbirm
authored
Merge pull request #639 from camicroscope/develop
For 3.10.2
2 parents 8760469 + 2293839 commit c14569f

29 files changed

+947
-242
lines changed

‎Caracal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 945e448e8e03ac72c26a7b4eee2b6f2b41f7d725

‎Distro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 4f107ac106b8ebd0422de32b6e9d69d00d0f517d

‎HISTORY.md

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
## Index
1010
* **Version 3**
11+
* [3.10.x](#camicroscope-3100)
1112
* [3.9.x](#camicroscope-390)
1213
* [3.8.x](#camicroscope-380)
1314
* [3.7.x](#camicroscope-377)
@@ -24,25 +25,54 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2425
* **Version 1**
2526
* [1.0.x](#camicroscope-10)
2627

27-
### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.9.10...camicroscope:develop)
28+
### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.10.2...camicroscope:develop)
2829
###### TBD
2930

31+
### caMicroscope [3.10.2](https://github.com/camicroscope/camicroscope/compare/v3.10.1...camicroscope:v3.10.2)
32+
###### 2023-06-16
33+
* point to point
34+
* Fixed Workbench Navbar Overlapping #580
35+
* The Reload button is not Responsive for small size devices #579
36+
* style: art Fixed fat hamburger icon & alignment issues of dropdown issue#596 #597
37+
* Styled export.html #601
38+
* fix: bug Responsiveness issues of workbench section #605 #605
39+
* Slight spelling mistake caught while browsing code #630
40+
* Adding Footer to Sign Up Page #635
41+
* Fixed the UI of admin page: Solved issue #621 #620
42+
* Fixed spelling mistake #614
43+
* FIXED Overlapping / Not properly styled on class=card in the workbench.html #616
44+
* Fixed import.html interface #613
45+
46+
### caMicroscope [3.10.1](https://github.com/camicroscope/camicroscope/compare/v3.10.0...camicroscope:v3.10.1)
47+
###### 2022-11-18
48+
* Bugfix for Magnifying glass with slide token auth
49+
50+
### caMicroscope [3.10.0](https://github.com/camicroscope/camicroscope/compare/v3.9.11...camicroscope:v3.10.0)
51+
###### 2022-10-25
52+
* Result Export Page [caMicroscope/566](https://github.com/camicroscope/caMicroscope/pull/566)
53+
* Slide Token injection [caMicroscope/567](https://github.com/camicroscope/caMicroscope/pull/567)
54+
55+
3056
### caMicroscope [3.9.11](https://github.com/camicroscope/camicroscope/compare/v3.9.10...camicroscope:v3.9.11)
3157
###### 2021-01-20
3258
* add redir page/app
3359

3460
### caMicroscope [3.9.10](https://github.com/camicroscope/camicroscope/compare/v3.9.9...camicroscope:v3.9.10)
3561
###### 2021-01-20
36-
62+
* pathdb mode improvements
3763

3864
### caMicroscope [3.9.9](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:v3.9.9)
3965
###### 2021-11-08
4066
* Fix and enhance Human Readable URL support
4167

42-
### caMicroscope [3.9.10](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:v3.9.10)
68+
### caMicroscope [3.9.10](https://github.com/camicroscope/camicroscope/compare/v3.9.9...camicroscope:v3.9.10)
4369
###### 2021-01-20
4470
* Human Readable Urls for pathdb
4571

72+
### caMicroscope [3.9.9](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:v3.9.9)
73+
###### 2021-11-08
74+
* Fix and enhance Human Readable URL support
75+
4676
### caMicroscope [3.9.8](https://github.com/camicroscope/camicroscope/compare/v3.9.6...camicroscope:v3.9.8)
4777
###### 2021-10-21
4878
* Add Segmentation -> Annotation Functionality [#542](https://github.com/camicroscope/caMicroscope/pull/542)

‎apps/Info.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<span class="navbar-toggler-icon"></span>
6060
</button>
6161
<div class="collapse navbar-collapse" id="navbarSupportedContent" >
62-
<ul class="navbar-nav mr-auto">
62+
<ul class="navbar-nav mr-auto gap-1">
6363
<li class="nav-item link" style="font-family: sans-serif;">
6464
<a class="nav-link" href="landing/landing.html"> <i class="fas fa-home"></i> Home</a>
6565
</li>

‎apps/admin/admin.css

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ iframe {
4949
.sidebar .nav-link {
5050
font-weight: 500;
5151
color: #5c5c5c;
52+
font-size: 15px;
53+
margin-bottom:5px
5254
}
5355
.sidebar .nav-link.active {
5456
font-weight: bold;
@@ -86,6 +88,9 @@ iframe {
8688
font-size: 1rem;
8789
background-color: rgba(0, 0, 0, 0.25);
8890
box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25);
91+
height: 60px;
92+
background-color: #007bff;
93+
8994
}
9095

9196
.navbar .navbar-toggler {
@@ -111,18 +116,55 @@ iframe {
111116
}
112117

113118
.title-icon {
114-
background-image: url("../../favicon.ico");
119+
background-image: url("./favicon_without_bg.png");
115120
background-repeat: no-repeat;
116-
background-size: 3rem 3rem;
121+
background-size: 4rem 3.8rem;
122+
padding-bottom: 2px;
117123
}
118124

119125
.title-txt {
120126
font-weight: bold;
121127
margin-left: 3rem;
128+
font-size: 1.5rem;
129+
padding-left: 12px;
122130
}
123131
.nav-link {
124132
cursor: pointer;
125133
}
134+
126135
.nav-link:hover{
127-
background-color: #dfdfdf;
136+
background-color: transparent;
137+
border:2px solid #fff;
138+
width: 100%;
139+
opacity: 1;
140+
padding: 10px;
141+
border-radius: 5px;
142+
font-weight: bold;
143+
}
144+
145+
@media (max-width: 767.98px) {
146+
.sidebar {
147+
top: 2rem;
148+
}
149+
.sign{
150+
text-align: center;
151+
margin: auto;
152+
padding: auto;
153+
}
154+
.nav-link:hover{
155+
padding: 5px;
156+
margin-top: 3px;
157+
margin-bottom: 3px;
158+
border:2px solid #fff;
159+
160+
}
161+
}
162+
163+
.sign-text{
164+
color: #fff !important;
165+
font-weight: 500px;
128166
}
167+
.sign-text:hover{
168+
color: #000 !important;
169+
background-color: #fff
170+
}

‎apps/admin/admin.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<meta name="theme-color" content="#7952b3" />
3838

3939
<style></style>
40-
<title>CaMicroScope Bashboard</title>
40+
<title>caMicroscope Dashboard</title>
4141
</head>
4242
<body>
4343
<header
@@ -63,9 +63,9 @@
6363
<span class="navbar-toggler-icon"></span>
6464
</button>
6565
<!-- <input class="form-control form-control-primary w-100" type="text" placeholder="Search" aria-label="Search"> -->
66-
<ul class="navbar-nav px-3">
66+
<ul class="navbar-nav px-3 sign">
6767
<li class="nav-item text-nowrap">
68-
<a class="nav-link" href="#">Sign out</a>
68+
<a class="nav-link sign-text" href="#">Sign out</a>
6969
</li>
7070
</ul>
7171
</header>

‎apps/admin/favicon_without_bg.png

24.8 KB
Loading

‎apps/dev-workbench/workbench.css

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
.btn {
1919
text-transform: unset !important;
2020
}
21-
.navbar {
22-
padding-left: 20px;
21+
.nabvar {
22+
display: flex;
23+
flex-direction: row;
2324
}
2425
.navbar-brand{
2526
margin-right: 10rem !important;
@@ -38,3 +39,23 @@
3839
#toastPlaceholder {
3940
display: none;
4041
}
42+
43+
44+
#goBack{
45+
display: flex;
46+
margin: 0 1rem;
47+
}
48+
@media only screen and (max-width: 551px) {
49+
nav {
50+
flex-direction: column;
51+
}
52+
53+
nav ul {
54+
flex-direction: column;
55+
}
56+
57+
nav ul li {
58+
margin: 10px 0;
59+
}
60+
}
61+

‎apps/dev-workbench/workbench.html

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,32 @@
6464
<body>
6565
<!--Navbar-->
6666
<nav
67-
class="navbar navbar-expand-lg navbar-dark"
67+
class="navbar navbar-expand-lg navbar-dark flex-row px-2"
6868
style="background: rgb(33, 37, 41);"
6969
>
7070
<div style="cursor: pointer;" id="goBack">
7171
<i data-feather="arrow-left" class="text-white"></i>
7272
</div>
7373

74+
<<<<<<< HEAD
75+
<!-- Navbar brand -->
76+
77+
<div class="navbar-brand-div flex-grow-1">
78+
<span style="cursor: default" class="navbar-brand " > Workbench</span>
79+
80+
</div>
81+
<div>
82+
83+
84+
<ul class="navbar-nav mr-auto px-2">
85+
=======
7486
<!-- Navbar brand -->
7587
<span style="cursor: default;" class="navbar-brand"> Workbench</span>
7688
<ul class="navbar-nav mr-auto">
89+
>>>>>>> master
7790
<!-- Dropdown -->
7891
<li
79-
style="position: absolute; right: 2em; margin-top: -1.3em;"
92+
8093
class="nav-item dropdown"
8194
>
8295
<a
@@ -88,7 +101,7 @@
88101
>Options</a
89102
>
90103
<div
91-
style="margin-left: -3em;"
104+
style="margin-left: -5em;"
92105
class="dropdown-menu dropdown-primary"
93106
aria-labelledby="navbarDropdownMenuLink"
94107
>
@@ -112,6 +125,8 @@
112125
<i class="fas fa-question-circle"></i>
113126
&nbsp;&nbsp;Help/User Guide</a
114127
>
128+
</div>
129+
115130
</div>
116131
</li>
117132
</ul>
@@ -224,7 +239,7 @@
224239
"
225240
>
226241
<!-- Cards -->
227-
<div class="card" style="max-width: 20em; margin: 0 auto;">
242+
<div class="card" style="max-width: 20em; margin-left:2cm; auto;">
228243
<!-- Card content -->
229244
<div class="card-body">
230245
<!-- Title -->
@@ -253,10 +268,10 @@ <h4 class="card-title">Select your dataset</h4>
253268
</div>
254269
</div>
255270
</div>
256-
<div style="height: 13em; padding: 6em 0; font-size: large;">
271+
<div style="height: 1em; margin-left:5cm; padding: 2em 0; font-size: large;">
257272
<b> OR</b>
258273
</div>
259-
<div class="card" style="max-width: 20em; margin: 0 auto;">
274+
<div class="card" style="max-width: 20em; margin-left:2cm; auto;">
260275
<!-- Card content -->
261276
<div class="card-body">
262277
<!-- Title -->

‎apps/landing/landing.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<span class="navbar-toggler-icon"></span>
4141
</button>
4242
<div class="collapse navbar-collapse" id="navbarSupportedContent" >
43-
<ul class="navbar-nav mr-auto">
43+
<ul class="navbar-nav mr-auto gap-1">
4444
<li class="nav-item active link" style="font-family: sans-serif;">
4545
<a class="nav-link" href="landing.html"> <i class="fas fa-home"></i> Home</a>
4646
</li>
@@ -118,7 +118,7 @@ <h3>Documentation</h3>
118118

119119

120120

121-
<section class="about">
121+
<section class="about" style="margin-left:0cm">
122122

123123
U24 CA18092401A1, <b>Tools to Analyze Morphology and Spatially Mapped Molecular Data</b>
124124
</section>

‎apps/landing/main.css

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,7 +1670,6 @@
16701670
display: inline-block;
16711671
font-size: 0.8em;
16721672
font-weight: 700;
1673-
height: 3.25em;
16741673
line-height: 3.35em;
16751674
padding: 0 2em;
16761675
text-align: center;
@@ -4741,9 +4740,7 @@
47414740
transition: background 0.5s;
47424741
border-radius: 3px;
47434742
}
4744-
nav li:not(:first-child){
4745-
margin-left: 0.3em !important;
4746-
}
4743+
47474744
nav li:not(.active):hover{
47484745
background: white;
47494746
}
@@ -4762,4 +4759,24 @@
47624759
.fas {
47634760
/* color: rgba(255,255,255,.5);; */
47644761
color: inherit;
4762+
}
4763+
4764+
/* Custom Scrollbar */
4765+
4766+
::-webkit-scrollbar {
4767+
width: 12px;
4768+
}
4769+
4770+
::-webkit-scrollbar-track {
4771+
box-shadow: inset 0 0 1px grey;
4772+
border-radius: 0px;
4773+
}
4774+
4775+
::-webkit-scrollbar-thumb {
4776+
background: #9a2ca0;
4777+
border-radius: 5px;
4778+
}
4779+
4780+
::-webkit-scrollbar-thumb:hover {
4781+
background: grey;
47654782
}

0 commit comments

Comments
 (0)