Skip to content

Commit f6a28fa

Browse files
birmbirm
committed
Merge branch 'pr1044' into develop
2 parents effeea0 + 81c551f commit f6a28fa

File tree

2 files changed

+67
-56
lines changed

2 files changed

+67
-56
lines changed

‎apps/landing/landing.html‎

Lines changed: 61 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!DOCTYPE html>
12
<html lang="en">
23
<head>
34

@@ -43,35 +44,51 @@
4344
</div>
4445
</div>
4546

46-
<nav class="navbar navbar-expand-lg navbar-dark fixed-top bg-dark" style="position: sticky; margin-top: -4em;">
47-
<div class="container-fluid">
48-
<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%;">
49-
<span class="navbar-toggler-icon"></span>
47+
<!-- Navigation Bar -->
48+
<nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
49+
<div class="container-fluid">
50+
<button
51+
class="navbar-toggler m-1"
52+
type="button"
53+
data-bs-toggle="collapse"
54+
data-bs-target="#navbarSupportedContent"
55+
aria-controls="navbarSupportedContent"
56+
aria-expanded="false"
57+
aria-label="Toggle navigation"
58+
>
59+
<span class="navbar-toggler-icon"></span>
5060
</button>
51-
<div class="collapse navbar-collapse" id="navbarSupportedContent" >
52-
<ul class="navbar-nav mr-auto gap-1">
53-
<li class="nav-item active link" style="font-family: sans-serif;">
54-
<a class="nav-link" href="landing.html"> <i class="fas fa-home"></i> Home</a>
61+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
62+
<ul class="navbar-nav me-auto gap-1">
63+
<li class="nav-item">
64+
<a class="nav-link" href="landing.html"><i class="fas fa-home"></i> Home</a>
5565
</li>
56-
<li class="nav-item link" style="font-family: sans-serif;">
57-
<a class="nav-link" href="../table.html"> <i class="fas fa-list-ul"></i> Slides</a>
66+
<li class="nav-item">
67+
<a class="nav-link" href="../table.html"><i class="fas fa-list-ul"></i> Slides</a>
5868
</li>
59-
<li class="nav-item link">
60-
<a class="nav-link" href="../Info.html"> <i class="fas fa-info-circle"></i> Info</a>
69+
<li class="nav-item">
70+
<a class="nav-link" href="../Info.html"><i class="fas fa-info-circle"></i> Info</a>
6171
</li>
62-
<li class="nav-item link">
63-
<a class="nav-link" href="../dev-workbench/workbench.html"> <i class="fas fa-pencil-ruler"></i> Workbench</a>
72+
<li class="nav-item">
73+
<a class="nav-link" href="../dev-workbench/workbench.html"><i class="fas fa-pencil-ruler"></i> Workbench</a>
6474
</li>
65-
<li class="nav-item link" style="font-family: sans-serif;">
66-
<a class="nav-link" href="../signup/signup.html"> <i class="fas fa-user-plus"></i> Signup</a>
75+
<li class="nav-item">
76+
<a class="nav-link" href="../signup/signup.html"><i class="fas fa-user-plus"></i> Signup</a>
6777
</li>
68-
<li class="nav-item link" style="font-family: sans-serif;">
69-
<a class="nav-link" target="_blank" href="https://github.com/camicroscope/caMicroscope/issues"> <i class="fas fa-comment"></i> Feedback</a>
78+
<li class="nav-item">
79+
<a
80+
class="nav-link"
81+
target="_blank"
82+
href="https://github.com/camicroscope/caMicroscope/issues"
83+
aria-label="Provide Feedback on GitHub"
84+
>
85+
<i class="fas fa-comment"></i> Feedback
86+
</a>
7087
</li>
7188
</ul>
7289
</div>
73-
</div>
74-
</nav>
90+
</div>
91+
</nav>
7592

7693

7794

@@ -116,36 +133,29 @@ <h2>Documentation</h2>
116133
</main>
117134

118135

119-
<!-- Footer -->
120-
<footer id="footer-layout"></footer>
121-
122-
123-
124-
125-
126-
<!-- Scripts -->
127-
<!-- loading animation script -->
128-
<script>
129-
var loader= document.querySelector('.loader');
130-
window.addEventListener('load', function() {
131-
loader.style.display = 'none';
132-
});
133-
</script>
134-
135-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8" crossorigin="anonymous"></script>
136-
<script src="./jquery.min.js"></script>
137-
138-
<script src="./jquery.dropotron.min.js"></script>
139-
140-
<script src="./jquery.scrollex.min.js"></script>
141-
142-
<script src="./skel.min.js"></script>
143-
144-
<script src="./util.js"></script>
145-
<script src="../../common/util.js"></script>
146-
147-
<!-- script to call a footer(layout footer in the common > utils folder) function -->
148-
<script> insertFooterLayout(); </script>
136+
<!-- Footer -->
137+
<footer id="footer-layout" role="contentinfo">
138+
<p>&copy; caMicroscope. All rights reserved.</p>
139+
</footer>
140+
141+
<!-- Scripts -->
142+
<script>
143+
var loader = document.querySelector('.loader');
144+
window.addEventListener('load', function() {
145+
loader.style.display = 'none';
146+
});
147+
</script>
148+
<script
149+
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
150+
integrity="sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8"
151+
crossorigin="anonymous"
152+
></script>
153+
<script src="./jquery.min.js"></script>
154+
<script src="./jquery.dropotron.min.js"></script>
155+
<script src="./jquery.scrollex.min.js"></script>
156+
<script src="./skel.min.js"></script>
157+
<script src="./util.js"></script>
158+
<script src="../../common/util.js"></script>
159+
<script>insertFooterLayout();</script>
149160
</body>
150-
151161
</html>

‎apps/landing/main.css‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
License: pixelarity.com/license
88
*/
99

10+
/* h1 */
11+
.page-title {
12+
font-size: 40px !important;
13+
}
14+
1015
/* Reset */
1116

1217
/* addind loader animation */
@@ -2716,7 +2721,7 @@
27162721
/* Wrapper */
27172722

27182723
.wrapper {
2719-
padding: 6.5em 0 4.5em 0 ;
2724+
padding: 3em 0 3em 0 ;
27202725
position: relative;
27212726
}
27222727

@@ -3816,10 +3821,6 @@
38163821

38173822
/* Header */
38183823

3819-
body {
3820-
padding-top: 3.5em;
3821-
}
3822-
38233824
body.landing {
38243825
padding-top: 0;
38253826
}

0 commit comments

Comments
 (0)