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.

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

Made navbar sticky #721

Merged
merged 3 commits into from
Jun 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions Css-files/ContactUpdate.css
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,12 @@ nav {
align-items: center;
padding-bottom: 1rem;
padding-top: 1rem;
position: fixed;
top: 0;
left: 0;
width: 100%;
z-index: 1000; /* Ensure it stays on top of other content */
background-color: black; /* Ensure the navbar has a background color */
}

.logo {
Expand Down
9 changes: 5 additions & 4 deletions Css-files/cart.css
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@
width: 100%;
}

<<<<<<< HEAD .empty-cart h4,
HEAD .empty-cart h4,
.empty-cart button {
=======.butt {
.butt {
color: white;
}

.empty-cart h4,
.empty-cart button {
>>>>>>>59a67a53a38fb9bc9e0501c4444bec55e9a10769 margin: 20px;
margin: 20px;
}

input,
Expand All @@ -140,4 +140,5 @@
align-items: flex-start;
gap: 5px;
}
}
}
}
25 changes: 18 additions & 7 deletions Css-files/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

body {
background-color: black;
margin: 0;
padding-top: 0;
}

.head_container:before {
Expand Down Expand Up @@ -619,19 +621,23 @@ td {
/* updated nav bar */
nav {
height: 3rem;
background: #0000007c;

width: 100%;
background-color: black;
}

.navigbar {
box-sizing: border-box;
display: flex;
justify-content: space-between;
align-items: center;
position: fixed;
top: 0;
width: 100%;
z-index: 1000; /* Ensure it stays on top of other content */
padding: 0 2rem;
background-color: black;
height: 3rem;
width: 95%;
margin: 0 auto;

box-sizing: border-box;
}

.logo {
Expand All @@ -652,11 +658,16 @@ nav {
justify-content: center;
/* Center items horizontally */
margin: 0;
/* Remove default margin */
padding: 0;
/* Remove default padding */
}

.ul2{
justify-content: flex-end;
}
.ul1 {
flex-grow: 1;
justify-content: center;
}
.ul1 li a,
.ul2 li a {
color: white;
Expand Down
5 changes: 5 additions & 0 deletions content/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ body {

.navbar {
padding: 8px 10px;
top: 0;
left: 0;
width: 100%;
z-index: 1000; /* Ensure it stays on top of other content */
background-color: black; /* Ensure the navbar has a background color */

}

Expand Down
9 changes: 8 additions & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

body {
background-color: black;
padding-top: 10px;
margin: 0;
}

.navbar {
Expand Down Expand Up @@ -1041,7 +1043,12 @@ nav {
.navigbar {
display: flex;
justify-content: space-between;
background: #0000007c;
position: fixed;
top: 0;
left: 0;
width: 100%;
z-index: 1000; /* Ensure it stays on top of other content */
background-color: black; /* Ensure the navbar has a background color */
padding-left: 2rem;
padding-right: 2rem;
align-items: center;
Expand Down
Loading