Skip to content
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

Jump to bottom

Updated to bootstrap@5 on signup and landing #518

Merged
merged 5 commits into from
May 10, 2021
Merged

Updated to bootstrap@5 on signup and landing #518

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dfde0b4
Merge pull request #513 from camicroscope/develop
birm Apr 7, 2021
18597ed
Merge pull request #515 from camicroscope/develop
birm Apr 15, 2021
828b8f3
Merge branch 'develop'
birm Apr 15, 2021
299f4b1
Updated to bootstrap 5
Priyaraj17 May 8, 2021
7b0c145
Updated viewer type selection box's style.
Priyaraj17 May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
73 changes: 35 additions & 38 deletions apps/landing/landing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@
<meta charset="utf-8" />

<meta name="viewport" content="width=device-width, initial-scale=1" />
<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="./main.css" />
<link rel="shortcut icon" type="image/x-icon" href="favicon.png">
<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">

</head>
<body>

Expand All @@ -38,33 +34,35 @@

</header> -->

<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark" style="position: sticky; margin-top: -4em;">
<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 active link" style="font-family: sans-serif;">
<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>
<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">
<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>
<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 active link" style="font-family: sans-serif;">
<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>
<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>

Expand All @@ -89,8 +87,7 @@ <h2>caMicroscope</h2>

</div>

<div class="posts">

<div class="posts" style="margin-top: 5em;">
<section class="post">
<a href="../table.html" class="image"><img src="./camic.jpg" alt=""/></a>
<div class="content">
Expand Down Expand Up @@ -140,7 +137,7 @@ <h3>Source Code</h3>


<!-- Scripts -->

<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="./jquery.min.js"></script>

<script src="./jquery.dropotron.min.js"></script>
Expand Down
40 changes: 28 additions & 12 deletions apps/landing/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,24 @@

/* Reset */


html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
color:#212529;
vertical-align: baseline;
font-family: Arial, Helvetica, sans-serif;
}

article, aside, details, figcaption, figure, footer, hgroup, menu, nav, section {
display: block;
}

body {
line-height: 1;
line-height: 1.5;
}

ol, ul {
Expand Down Expand Up @@ -960,7 +963,7 @@
}

@media screen and (max-width: 736px) {

.row > * {
padding: 0 0 0 2em;
}
Expand Down Expand Up @@ -1175,6 +1178,7 @@
}

@media screen and (max-width: 480px) {


.row > * {
padding: 0 0 0 2em;
Expand Down Expand Up @@ -1469,15 +1473,15 @@
}

p {
margin: 0 0 2em 0;
margin: 0 0 1em 0;
}

h1, h2, h3, h4, h5, h6 {
font-weight: 700;
line-height: 1em;
margin: 0 0 1em 0;
text-transform: uppercase;
letter-spacing: 0.05em;
font: inherit;
}

h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
Expand All @@ -1486,12 +1490,12 @@
}

h2 {
font-size: 1.75em;
font-size: 2em;
line-height: 1.5em;
}

h3 {
font-size: 0.9em;
font-size: 1.75em;
line-height: 1.5em;
}

Expand All @@ -1512,15 +1516,15 @@

@media screen and (max-width: 1280px) {

h2 {
h2, h3 {
font-size: 1.5em;
}

}

@media screen and (max-width: 736px) {

h2 {
h2, h3 {
font-size: 1.25em;
}

Expand Down Expand Up @@ -2548,7 +2552,7 @@
}

header.major p {
margin-bottom: 1em;
/* margin-bottom: 1em; */
}

header.major:after {
Expand Down Expand Up @@ -3760,6 +3764,9 @@
.wrapper {
padding: 2.5em 1.5em 0.5em 1.5em ;
}
header.major {
text-align: center;
}

}

Expand Down Expand Up @@ -4403,6 +4410,9 @@
#footer header.major:after {
background-color: #ffffff;
}
.about {
color: #fff;
}

#footer .content {
padding: 6.5em 0 4.5em 0 ;
Expand All @@ -4425,7 +4435,8 @@

#footer .content > .inner .about {
padding-left: 0;
width: 50%;
width: 60%;
margin: 0 auto;
}

@media screen and (max-width: 1280px) {
Expand Down Expand Up @@ -4726,8 +4737,6 @@
font-family: "Open Sans", Helvetica, sans-serif;
line-height: 1.8;
}


nav li{
transition: background 0.5s;
border-radius: 3px;
Expand All @@ -4747,3 +4756,10 @@
.active a{
color: black !important;
}
.bg-dark {
background-color: #343a40 !important;
}
.fas {
/* color: rgba(255,255,255,.5);; */
color: inherit;
}
17 changes: 16 additions & 1 deletion apps/signup/signup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@ body {
color: #999;
background: #f5f5f5;
font-family: 'Roboto', sans-serif;
overflow-x: hidden;
}
.bg-dark {
background-color: #343a40!important;
}
.form-control, .form-control:focus, .input-group-addon {
border-color: #e1e1e1;
border-radius: 0;
}
.signup-form {
width: 390px;
margin: 0 auto;
margin: 5% auto;
padding: 30px 0;
}
.signup-form h2 {
Expand Down Expand Up @@ -113,4 +117,15 @@ nav li:not(.active):hover a{

.text-center{
cursor: pointer;
}

@media screen and (max-width:736px) {
.signup-form {
margin: 20% auto;
}
}
@media screen and (max-width: 480px) {
.signup-form {
width: 300px;
}
}
64 changes: 31 additions & 33 deletions apps/signup/signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
<!-- Font Awesome -->
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css">
<!-- Bootstrap core CSS -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.4.1/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">

<link rel='stylesheet' type='text/css' media='all' href='../../css/normalize.css'/>
<link rel='stylesheet' type='text/css' media='all' href='signup.css'/>
Expand All @@ -23,14 +25,7 @@
src="https://code.jquery.com/jquery-3.4.1.min.js"
integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
crossorigin="anonymous"></script>
<!-- Bootstrap core JavaScript -->
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
crossorigin="anonymous"></script>
<!-- Bootstrap tooltips -->
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
crossorigin="anonymous"></script>




Expand All @@ -40,30 +35,31 @@

<body>

<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>
</ul>
<ul class="navbar-nav">
<li class="nav-item active link" style="font-family: sans-serif;">
<a class="nav-link" href="./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>
<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 link" style="font-family: sans-serif;">
<a class="nav-link" href="../table.html"> <i class="fas fa-list-ul"></i> Slides</a>
</li>
</ul>
<ul class="navbar-nav ms-auto">
<li class="nav-item link active" style="font-family: sans-serif;">
<a class="nav-link" href="./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>

</nav>

<div class="signup-form">
<div
Expand Down Expand Up @@ -118,7 +114,9 @@ <h2 style="margin-top: -.5em;">User Signup</h2>
<!-- popup -->
<div id="popup-container"></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="../../common/util.js"></script>

</body>
Expand Down