Skip to content

Update bootstrap in table.html, workbench.html and info.html #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
birm merged 2 commits into from
May 13, 2021
Merged

Update bootstrap in table.html, workbench.html and info.html #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8da0748
Updated table.html, workbench.html and info.html
May 10, 2021
feb9d49
fixed slide upload button / modal
May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 37 additions & 36 deletions apps/Info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/css/bootstrap.min.css"
rel="stylesheet"
integrity="sha384-wEmeIV1mKuiNpC+IOBjI7aAzPcEZeedi5yW5f2yOq55WWLwNGmvvx4Um1vskeMj0"
crossorigin="anonymous">
<link rel="stylesheet" href="../common/stacktable.css">
<style>
html,
Expand All @@ -53,35 +53,37 @@
<body>
<div class="page-container">
<div>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark" style="position: sticky;">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item link">
<a class="nav-link" href="landing/landing.html"> <i class="fas fa-home"></i> Home</a>
</li>
<li class="nav-item link">
<a class="nav-link" href="table.html"> <i class="fas fa-list-ul"></i> Slides</a>
</li>
<li class="nav-item active link">
<a class="nav-link" href="Info.html"> <i class="fas fa-info-circle"></i> Info</a>
</li>
<li class="nav-item link">
<a class="nav-link" href="./dev-workbench/workbench.html"> <i class="fas fa-pencil-ruler"></i> Workbench</a>
</li>
</ul>
<ul class="navbar-nav">
<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">
<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>
</nav>
<nav class="navbar navbar-expand-lg navbar-dark fixed-top bg-dark" style="position: sticky; margin-top: -4em;">
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent" >
<ul class="navbar-nav mr-auto">
<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>
<li class="nav-item active link" style="font-family: sans-serif;">
<a class="nav-link" href="table.html"> <i class="fas fa-list-ul"></i> Slides</a>
</li>
<li class="nav-item link">
<a class="nav-link" href="Info.html"> <i class="fas fa-info-circle"></i> Info</a>
</li>
<li class="nav-item link">
<a class="nav-link" href="./dev-workbench/workbench.html"> <i class="fas fa-pencil-ruler"></i> Workbench</a>
</li>
</ul>
<ul class="navbar-nav ms-auto">
<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>
Expand All @@ -94,7 +96,6 @@ <h1 class="h1">caMicroscope</h1>
</div>
</div>


<div class="modal fade" id="detail-dialog" tabindex="-1" role="dialog"
aria-labelledby="title-of-dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false" >
<div class="modal-dialog modal-dialog-centered modal-dialog-scrollable modal-lg" role="document" style="margin-top:8vh;">
Expand Down Expand Up @@ -171,7 +172,7 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor
<p class="p">Copyright © 2021 caMicroscope</p>
</footer>
</div>

<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8" crossorigin="anonymous"></script>
</body>
<script>

Expand Down
4 changes: 3 additions & 1 deletion apps/dev-workbench/workbench.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
.btn {
text-transform: unset !important;
}

.navbar {
padding-left: 20px;
}
/* All display none */
#importFile,
#headContent,
Expand Down
13 changes: 8 additions & 5 deletions apps/dev-workbench/workbench.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
/>
<!-- Bootstrap core CSS -->
<link
href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.0/css/bootstrap.min.css"
rel="stylesheet"
/>
<link
href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/css/bootstrap.min.css"
rel="stylesheet" integrity="sha384-wEmeIV1mKuiNpC+IOBjI7aAzPcEZeedi5yW5f2yOq55WWLwNGmvvx4Um1vskeMj0"
crossorigin="anonymous"
>
<!-- Material Design Bootstrap -->
<link
href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.19.0/css/mdb.min.css"
Expand Down Expand Up @@ -492,7 +493,9 @@ <h5 class="modal-title" id="helpModalTitle">Help - User Guide</h5>
</button>
</div>
</div>

<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/js/bootstrap.bundle.min.js"
integrity="sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8"
crossorigin="anonymous"></script>
<script src="./workbench.js"></script>
<script>
feather.replace(); // for feather Icons
Expand Down
11 changes: 10 additions & 1 deletion apps/info.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,23 @@ body {
width: 100%;
height: 100%;
min-height: 100%;
font-family: Arial, Helvetica, sans-serif;
}

footer{
position: relative;
bottom: 0;
width: 100%;
}

.header {
margin-top: 60px;
}
.bg-dark {
background-color: #343a40 !important;
}
.bg-info {
background-color: #17a2b8!important;
}
.page-container{
height:100vh;
display: flex;
Expand Down
11 changes: 10 additions & 1 deletion apps/table.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@ html,
width: 100%;
height: 100%;
min-height: 100%;
font-family: Arial, Helvetica, sans-serif;
}

footer{
position: relative;
bottom: 0;
width: 100%;
}
.header {
margin-top: 60px;
}

.page-container{
height:100vh;
Expand All @@ -31,7 +35,12 @@ footer{
font-family: "Open Sans", Helvetica, sans-serif;
/* line-height: 1.8; */
}

.bg-dark {
background-color: #343a40 !important;
}
.bg-info {
background-color: #17a2b8!important;
}
#collection-list li.item {
cursor: pointer;
}
Expand Down
Loading