-
Notifications
You must be signed in to change notification settings - Fork 298
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into import-form-test
- Loading branch information
Showing
40 changed files
with
5,674 additions
and
310 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<html lang="en"> | ||
|
||
<head> | ||
<meta name="keywords" content="camicroscope, quip" /> | ||
<meta charset='utf-8'> | ||
<meta http-equiv='X-UA-Compatible' content='IE=edge'> | ||
<meta name='viewport' | ||
content='width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no'> | ||
content='width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=2.0'> | ||
<!-- common --> | ||
<!-- <link rel='stylesheet' type='text/css' media='all' href='../css/style.css'/> --> | ||
<!-- Check If we're logged in ok, otherwise, log in for us --> | ||
|
@@ -35,6 +35,8 @@ | |
integrity="sha384-wEmeIV1mKuiNpC+IOBjI7aAzPcEZeedi5yW5f2yOq55WWLwNGmvvx4Um1vskeMj0" | ||
crossorigin="anonymous"> | ||
<link rel="stylesheet" href="../common/stacktable.css"> | ||
<!-- common styling --> | ||
<link rel="stylesheet" href="./common.css"> | ||
<style> | ||
html, | ||
body { | ||
|
@@ -75,17 +77,14 @@ | |
<li class="nav-item link" style="font-family: sans-serif;"> | ||
<a class="nav-link" href="./signup/signup.html"> <i class="fas fa-user-plus"></i> Signup</a> | ||
</li> | ||
<li class="nav-item link" style="font-family: sans-serif;"> | ||
<a class="nav-link" target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform"> <i class="fas fa-comment"></i> Feedback</a> | ||
</li> | ||
</ul> | ||
</div> | ||
</div> | ||
</nav> | ||
|
||
<div class="header text-center text-white bg-info p-4"> | ||
<h1 class="h1">caMicroscope</h1> | ||
<p>Digital pathology image viewer with support for human/machine generated annotations and markups.</p> | ||
<p style="font-weight: bold; font-size: 14pt;">Digital pathology image viewer with support for human/machine generated annotations and markups.</p> | ||
<div style="align-content: center;"> | ||
<div class="btn-group" role="group"> | ||
<a href="./table.html"> <button style="border-color: white; border-radius: 5px 0 0 5px;" type="button" class="btn btn-secondary bg-info text-light" title="Slides Table"><i class="fas fa-list-alt"></i> Slides</button> </a> | ||
|
@@ -166,10 +165,13 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor | |
</div> | ||
</div> | ||
|
||
<footer class="text-center text-white bg-dark p-3 mt-2"> | ||
<p class="p">Copyright © 2021 caMicroscope</p> | ||
</footer> | ||
|
||
<!-- footer --> | ||
<footer id="footer-layout"></footer> | ||
</div> | ||
|
||
<!-- script to call a footer(layout footer in the common > utils folder) function --> | ||
<script> insertFooterLayout(); </script> | ||
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8" crossorigin="anonymous"></script> | ||
</body> | ||
<script> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,54 @@ | ||
.text-in-line { | ||
margin: 0 auto; | ||
white-space: nowrap; | ||
overflow: hidden; | ||
text-overflow: ellipsis; | ||
margin: 0 auto; | ||
white-space: nowrap; | ||
overflow: hidden; | ||
text-overflow: ellipsis; | ||
} | ||
|
||
/* layout footer styles */ | ||
#footer-layout hr { | ||
border-bottom-color: #ffffff; | ||
padding: 0; | ||
margin: 0; | ||
} | ||
|
||
#footer-layout hr { | ||
border-bottom-color: #ffffff; | ||
padding: 0; | ||
margin: 0; | ||
} | ||
|
||
#footer-layout { | ||
color: whitesmoke; | ||
text-align: left; | ||
padding: 2.5em 4.5em; | ||
background-color: #343a40; | ||
} | ||
|
||
#footer-layout p { | ||
color: whitesmoke; | ||
} | ||
|
||
.company-name { | ||
color: #24a9f6; | ||
} | ||
|
||
.company-name a { | ||
color: #24a9f6; | ||
text-decoration: none; | ||
} | ||
|
||
.company-name:hover { | ||
color: #4f5e66; | ||
text-decoration: underline; | ||
} | ||
#footer-layout strong, | ||
#footer-layout b { | ||
color: #ffffff; | ||
} | ||
|
||
@media (max-width: 768px) { | ||
#footer-layout { | ||
padding: 2em 2.5em; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<html lang="en"> | ||
|
||
<head> | ||
<meta name="keywords" content="camicroscope, quip" /> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<html lang="en"> | ||
|
||
<head> | ||
<meta name="keywords" content="camicroscope, quip" /> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.