Skip to content

Commit

Permalink
Merge pull request #921 from meetarora10/modify-branch
Browse files Browse the repository at this point in the history
Made the navbar sticky in all the pages .
  • Loading branch information
RitiChandak authored Aug 8, 2024
2 parents a8424c1 + a97264e commit 2cc6301
Show file tree
Hide file tree
Showing 10 changed files with 145 additions and 39 deletions.
6 changes: 5 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,11 @@
text-transform: uppercase !important;
font-weight: 700 !important;
}

.navbar{
position: fixed;
width: 100vw;
z-index: 101;
}
.page-header .navbar {
color: white;
}
Expand Down
7 changes: 5 additions & 2 deletions src/cart.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@
text-transform: uppercase !important;
font-weight: 700 !important;
}
.navbar{
position: fixed;
width: 100vw;
z-index: 101;
}
.page-header .navbar {
color: white;
}
Expand Down Expand Up @@ -243,8 +248,6 @@
margin-top: 10px;
}
}

}
.nav-item{
margin-top: 5px;
}
Expand Down
7 changes: 7 additions & 0 deletions src/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,13 @@

}
</style>
<style>
.navbar{
position: fixed;
width: 100vw;
z-index: 101;
}
</style>
</head>
<body class="light">

Expand Down
78 changes: 76 additions & 2 deletions src/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,47 @@
text-transform: uppercase !important;
font-weight: 700 !important;
}


.navbar{
position: fixed;
width: 100vw;
z-index: 101;
}
.page-header .navbar {
color: white;
}
.banner .jumbotron .overlay {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
z-index: 2;
}

.banner .jumbotron .container {
position: relative;
z-index: 3;
padding-top: 200px; /* Adjust padding as needed to position the text correctly */
text-align: center;

}

.banner .jumbotron .container h1,
.banner .jumbotron .container p {
color: #FFF;
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7);
}


.banner .jumbotron .container {
margin-top: 2.3rem;
/* background-color: transparent; */
border: none;
}
.banner .jumbotron {

.page-header .navbar .navbar-brand img {
margin-left: -160px;
object-fit: cover;
Expand Down Expand Up @@ -167,6 +203,7 @@
}

.banner .jumbotron {

margin-bottom: 0;
padding: 0;
position: relative;
Expand Down Expand Up @@ -259,7 +296,44 @@
text-align: center;
margin-top: 20px;
}
</style>
.banner .jumbotron .container {
border: none;
color: #FFF;
}

.banner .jumbotron .container {
color: #FFF;
text-transform: uppercase;
}


#progressBar {
position: fixed;
top: 0;
left: 0;
width: 0%;
height: 8px;
background-color: #E91E63;
z-index: 9999;

}


</style>
</head>

<body class="light">
<!-- Progress bar -->
<div id="progressBar"></div>
<script>
window.onscroll = function () {
var winScroll = document.body.scrollTop || document.documentElement.scrollTop;
var height = document.documentElement.scrollHeight - document.documentElement.clientHeight;
var scrolled = (winScroll / height) * 100;
document.getElementById("progressBar").style.width = scrolled + "%";
};
</script>
<!-- end -->
</head>

<body class="light">
Expand Down
6 changes: 5 additions & 1 deletion src/privacypolicy.html
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,11 @@
text-transform: uppercase !important;
font-weight: 700 !important;
}

.navbar{
position: fixed;
width: 100vw;
z-index: 101;
}
.page-header .navbar {
color: white;
}
Expand Down
6 changes: 6 additions & 0 deletions src/rateus.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@
/>
<link rel="stylesheet" href="../assets/css/feedback.css" />
<style>

.navbar{
position: fixed;
width: 100vw;
z-index: 101;


.rating-container {
margin-top: -20px; /* Move the heading and emojis up */
Expand Down
5 changes: 5 additions & 0 deletions src/shop.html
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,11 @@
text-transform: uppercase !important;
font-weight: 700 !important;
}
.navbar{
position: fixed;
width: 100vw;
z-index: 101;
}
.page-header .navbar {
color: white;
}
Expand Down
6 changes: 5 additions & 1 deletion src/termsandconditions.html
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,11 @@
text-transform: uppercase !important;
font-weight: 700 !important;
}

.navbar{
position: fixed;
width: 100vw;
z-index: 101;
}
.page-header .navbar {
color: white;
}
Expand Down
6 changes: 5 additions & 1 deletion src/transaction.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@
text-transform: uppercase !important;
font-weight: 700 !important;
}

.navbar{
position: fixed;
width: 100vw;
z-index: 101;
}
.page-header .navbar {
color: white;
}
Expand Down
57 changes: 26 additions & 31 deletions src/wishlist.html
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@
text-transform: uppercase !important;
font-weight: 700 !important;
}
.navbar{
position: fixed;
width: 100vw;
z-index: 101;
}
.page-header .navbar {
color: white;
}
Expand Down Expand Up @@ -270,6 +275,27 @@
z-index: 1;
}

.banner .jumbotron .container h1,
.banner .jumbotron .container p {
color: #fff;
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7);
}

.banner .jumbotron .container {
margin-top: 2.3rem;
/* background-color: transparent; */
border: none;
}

.banner .jumbotron .container {
border: none;
color: #fff;
}

.banner .jumbotron .container {
color: #fff;
text-transform: uppercase;
}
.banner .jumbotron .overlay {
position: absolute;
top: 0;
Expand Down Expand Up @@ -314,7 +340,6 @@
top: 50px;
}
}
}
#progressBar {
position: fixed;
top: 0;
Expand All @@ -338,36 +363,6 @@
};
</script>
<!-- end -->

<div class="page-header">
<!--=============== Navbar ===============-->
<nav class="navbar navbar-expand-md navbar-dark bg-dark">
<div class="container">
<!-- Navbar Brand -->


.banner .jumbotron .container h1,
.banner .jumbotron .container p {
color: #fff;
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7);
}

.banner .jumbotron .container {
margin-top: 2.3rem;
/* background-color: transparent; */
border: none;
}

.banner .jumbotron .container {
border: none;
color: #fff;
}

.banner .jumbotron .container {
color: #fff;
text-transform: uppercase;
}
</style>
<body>
<div class="page-header">
<!--=============== Navbar ===============-->
Expand Down

0 comments on commit 2cc6301

Please sign in to comment.