Skip to content

Commit

Permalink
Merge branch 'pr1044' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@birm
birm committed Jan 23, 2025
2 parents effeea0 + 81c551f commit f6a28fa
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 56 deletions.
112 changes: 61 additions & 51 deletions apps/landing/landing.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!DOCTYPE html>
<html lang="en">
<head>

Expand Down Expand Up @@ -43,35 +44,51 @@
</div>
</div>

<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 m-1" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation" style="width: 100%;">
<span class="navbar-toggler-icon"></span>
<!-- Navigation Bar -->
<nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
<div class="container-fluid">
<button
class="navbar-toggler m-1"
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 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>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto gap-1">
<li class="nav-item">
<a class="nav-link" href="landing.html"><i class="fas fa-home"></i> Home</a>
</li>
<li class="nav-item link" style="font-family: sans-serif;">
<a class="nav-link" href="../table.html"> <i class="fas fa-list-ul"></i> Slides</a>
<li class="nav-item">
<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 class="nav-item">
<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 class="nav-item">
<a class="nav-link" href="../dev-workbench/workbench.html"><i class="fas fa-pencil-ruler"></i> Workbench</a>
</li>
<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 class="nav-item">
<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://github.com/camicroscope/caMicroscope/issues"> <i class="fas fa-comment"></i> Feedback</a>
<li class="nav-item">
<a
class="nav-link"
target="_blank"
href="https://github.com/camicroscope/caMicroscope/issues"
aria-label="Provide Feedback on GitHub"
>
<i class="fas fa-comment"></i> Feedback
</a>
</li>
</ul>
</div>
</div>
</nav>
</div>
</nav>



Expand Down Expand Up @@ -116,36 +133,29 @@ <h2>Documentation</h2>
</main>


<!-- Footer -->
<footer id="footer-layout"></footer>





<!-- Scripts -->
<!-- loading animation script -->
<script>
var loader= document.querySelector('.loader');
window.addEventListener('load', function() {
loader.style.display = 'none';
});
</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>
<script src="./jquery.min.js"></script>

<script src="./jquery.dropotron.min.js"></script>

<script src="./jquery.scrollex.min.js"></script>

<script src="./skel.min.js"></script>

<script src="./util.js"></script>
<script src="../../common/util.js"></script>

<!-- script to call a footer(layout footer in the common > utils folder) function -->
<script> insertFooterLayout(); </script>
<!-- Footer -->
<footer id="footer-layout" role="contentinfo">
<p>&copy; caMicroscope. All rights reserved.</p>
</footer>

<!-- Scripts -->
<script>
var loader = document.querySelector('.loader');
window.addEventListener('load', function() {
loader.style.display = 'none';
});
</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>
<script src="./jquery.min.js"></script>
<script src="./jquery.dropotron.min.js"></script>
<script src="./jquery.scrollex.min.js"></script>
<script src="./skel.min.js"></script>
<script src="./util.js"></script>
<script src="../../common/util.js"></script>
<script>insertFooterLayout();</script>
</body>

</html>
11 changes: 6 additions & 5 deletions apps/landing/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
License: pixelarity.com/license
*/

/* h1 */
.page-title {
font-size: 40px !important;
}

/* Reset */

/* addind loader animation */
Expand Down Expand Up @@ -2716,7 +2721,7 @@
/* Wrapper */

.wrapper {
padding: 6.5em 0 4.5em 0 ;
padding: 3em 0 3em 0 ;
position: relative;
}

Expand Down Expand Up @@ -3816,10 +3821,6 @@

/* Header */

body {
padding-top: 3.5em;
}

body.landing {
padding-top: 0;
}
Expand Down

0 comments on commit f6a28fa

Please sign in to comment.