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

#91 Navbar branch update #117

Closed
wants to merge 6 commits into from
Closed

#91 Navbar branch update #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd2cdd5
#91 navbar fixes
KajalDeore04 Oct 2, 2024
56d5c3e
#91 navbar to all pages with distict difference between every page, a…
KajalDeore04 Oct 2, 2024
141af35
navbar to all pages, fixed the ui
KajalDeore04 Oct 2, 2024
fb733ae
cart redirectiion issue solved
KajalDeore04 Oct 2, 2024
8d2e45f
Merge branch 'main' into main
Anjaliavv51 Oct 2, 2024
6c0beee
Merge branch 'Anjaliavv51:main' into navbar
KajalDeore04 Oct 3, 2024
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
40 changes: 31 additions & 9 deletions Html-files/Electronic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,17 +524,39 @@

<div class="head_container_service" style="color: black;font-family: var(--ff-philosopher);">
<header style="font-family: var(--ff-philosopher);">
<nav class="navbar">
<ul id="header-items" style="color: black;font-family: var(--ff-philosopher);justify-content: center;">
<li><a href="../index.html" style="color: black;">&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Home</a></li>
<li><a href="menu.html" style="color: black;">About</a></li>
<li><a href="services.html" style="color: black;">Services</a></li>
<li><a href="contact.html" style="color: black;">Contact us</a></li>
<li><a href="cart.html" style="color: black;">Cart</a></li>
<nav class="navbar fixed-top" id="top" style="display: flex; flex-direction: row; background-color: rgb(223, 151, 151); border:0.5rem outset pink; border-radius: 150px; padding-left: 100px; margin-top: 20px;">
<a class="navbar-brand" href="/index.html" style="font-family: var(--ff-philosopher); color: black; font-size: 40px;">Retro</a>
<ul class="navbar-nav" style="display: flex;flex-direction: row; flex-wrap: nowrap; justify-content: space-between; margin-left: 20px;">
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="/Html-files/menu.html" style="font-family: var(--ff-philosopher); color: black;">Collection</a>
</li>
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="/Html-files/services.html" style="font-family: var(--ff-philosopher); color: black;">Services</a>
</li>
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="/Html-files/contact.html" style="font-family: var(--ff-philosopher); color: black;">Contact Us</a>
</li>
<!-- Google Translate Element -->
<li class="nav-item" style="display: inline-block;">
<div id="google_element" style="font-family: var(--ff-philosopher); color: black;"></div>
</li>
</ul>
</nav>
<div class="d-flex" style="justify-content: flex-end;flex-direction: row; margin-left: auto; padding-right: 50px;">
<li class="nav-item" style="list-style-type: none; display: inline-block;">
<a class="nav-btn" href="login.html" style="color: black;">Login</a>
</li>
<li class="nav-item" style="list-style-type: none; display: inline-block;">
<a class="nav-btn" href="signup.html" style="color: black;">Sign Up</a>
</li>
<li class="nav-item" style="list-style-type: none; display: inline-block;">
<a class="nav-btn" href="cart.html" style="color: black;"><i class="fa-solid fa-cart-shopping"></i></a>
</li>
</div>
</nav>
</header>



</div>
<div class="wrapper">
<div class="container">
Expand Down
99 changes: 61 additions & 38 deletions Html-files/cart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,44 +247,67 @@
<body>
<div id="preloader">
<div id="loader"></div>
</div>
<div class="circle-container">
<div class="circle" style="background-color: rgb(255, 181, 107); left: 504px; top: 59px; scale: 1;"></div>
<div class="circle" style="background-color: rgb(253, 175, 105); left: 504px; top: 59px; scale: 0.95;"></div>
<div class="circle" style="background-color: rgb(248, 157, 99); left: 504px; top: 59px; scale: 0.9;"></div>
<div class="circle" style="background-color: rgb(245, 151, 97); left: 504px; top: 59px; scale: 0.85;"></div>
<div class="circle" style="background-color: rgb(239, 134, 94); left: 504px; top: 59px; scale: 0.8;"></div>
<div class="circle" style="background-color: rgb(236, 128, 93); left: 504px; top: 59px; scale: 0.75;"></div>
<div class="circle" style="background-color: rgb(227, 110, 92); left: 504px; top: 59px; scale: 0.7;"></div>
<div class="circle" style="background-color: rgb(223, 104, 92); left: 504px; top: 59px; scale: 0.65;"></div>
<div class="circle" style="background-color: rgb(213, 88, 92); left: 504px; top: 59px; scale: 0.6;"></div>
<div class="circle" style="background-color: rgb(209, 82, 92); left: 504px; top: 59px; scale: 0.55;"></div>
<div class="circle" style="background-color: rgb(197, 65, 93); left: 504px; top: 59px; scale: 0.5;"></div>
<div class="circle" style="background-color: rgb(192, 59, 93); left: 504px; top: 59px; scale: 0.45;"></div>
<div class="circle" style="background-color: rgb(178, 44, 94); left: 504px; top: 59px; scale: 0.4;"></div>
<div class="circle" style="background-color: rgb(172, 38, 94); left: 504px; top: 59px; scale: 0.35;"></div>
<div class="circle" style="background-color: rgb(156, 21, 95); left: 504px; top: 59px; scale: 0.3;"></div>
<div class="circle" style="background-color: rgb(149, 15, 95); left: 504px; top: 59px; scale: 0.25;"></div>
<div class="circle" style="background-color: rgb(131, 0, 96); left: 504px; top: 59px; scale: 0.2;"></div>
<div class="circle" style="background-color: rgb(124, 0, 96); left: 504px; top: 59px; scale: 0.15;"></div>
<div class="circle" style="background-color: rgb(104, 0, 96); left: 504px; top: 59px; scale: 0.1;"></div>
<div class="circle" style="background-color: rgb(96, 0, 95); left: 504px; top: 59px; scale: 0.05;"></div>
</div>
<div class="head_container" style="background-color: transparent;font-family: Georgia;">
<header>
<nav class="navbar">
<ul id="header-items">
<li><a href="../Home.html" style="color: black;font-family: var(--ff-philosopher);">Home</a></li>
<li><a href="menu.html" style="color: black;font-family: var(--ff-philosopher);">About</a></li>
<li><a href="services.html" style="color: black;font-family: var(--ff-philosopher);">Services</a></li>
<li><a href="contact.html" style="color: black;font-family: var(--ff-philosopher);">Contact us</a></li>
<li><a href="cart.html" style="color: black;font-family: var(--ff-philosopher);">Cart</a></li>
</ul>
</nav>
</header>

<div class="mainhead">
<h1 style="color: black;font-family: var(--ff-philosopher);">C A R T</h1>
</div>
<div class="circle-container">
<div class="circle" style="background-color: rgb(255, 181, 107); left: 504px; top: 59px; scale: 1;"></div>
<div class="circle" style="background-color: rgb(253, 175, 105); left: 504px; top: 59px; scale: 0.95;"></div>
<div class="circle" style="background-color: rgb(248, 157, 99); left: 504px; top: 59px; scale: 0.9;"></div>
<div class="circle" style="background-color: rgb(245, 151, 97); left: 504px; top: 59px; scale: 0.85;"></div>
<div class="circle" style="background-color: rgb(239, 134, 94); left: 504px; top: 59px; scale: 0.8;"></div>
<div class="circle" style="background-color: rgb(236, 128, 93); left: 504px; top: 59px; scale: 0.75;"></div>
<div class="circle" style="background-color: rgb(227, 110, 92); left: 504px; top: 59px; scale: 0.7;"></div>
<div class="circle" style="background-color: rgb(223, 104, 92); left: 504px; top: 59px; scale: 0.65;"></div>
<div class="circle" style="background-color: rgb(213, 88, 92); left: 504px; top: 59px; scale: 0.6;"></div>
<div class="circle" style="background-color: rgb(209, 82, 92); left: 504px; top: 59px; scale: 0.55;"></div>
<div class="circle" style="background-color: rgb(197, 65, 93); left: 504px; top: 59px; scale: 0.5;"></div>
<div class="circle" style="background-color: rgb(192, 59, 93); left: 504px; top: 59px; scale: 0.45;"></div>
<div class="circle" style="background-color: rgb(178, 44, 94); left: 504px; top: 59px; scale: 0.4;"></div>
<div class="circle" style="background-color: rgb(172, 38, 94); left: 504px; top: 59px; scale: 0.35;"></div>
<div class="circle" style="background-color: rgb(156, 21, 95); left: 504px; top: 59px; scale: 0.3;"></div>
<div class="circle" style="background-color: rgb(149, 15, 95); left: 504px; top: 59px; scale: 0.25;"></div>
<div class="circle" style="background-color: rgb(131, 0, 96); left: 504px; top: 59px; scale: 0.2;"></div>
<div class="circle" style="background-color: rgb(124, 0, 96); left: 504px; top: 59px; scale: 0.15;"></div>
<div class="circle" style="background-color: rgb(104, 0, 96); left: 504px; top: 59px; scale: 0.1;"></div>
<div class="circle" style="background-color: rgb(96, 0, 95); left: 504px; top: 59px; scale: 0.05;"></div>
</div>
<div class="head_container" style="background-color: transparent;font-family: Georgia;">
<header>
<nav class="navbar fixed-top" id="top" style="display: flex; flex-direction: row; background-color: rgb(223, 151, 151); border:0.5rem outset pink; border-radius: 150px; padding-left: 100px; margin-top: 20px;">
<a class="navbar-brand" href="/index.html" style="font-family: var(--ff-philosopher); color: black; font-size: 40px;">Retro</a>
<ul class="navbar-nav" style="display: flex;flex-direction: row; flex-wrap: nowrap; justify-content: space-between; margin-left: 20px;">
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="/Html-files/menu.html" style="font-family: var(--ff-philosopher); color: black;">Collection</a>
</li>
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="/Html-files/services.html" style="font-family: var(--ff-philosopher); color: black;">Services</a>
</li>
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="/Html-files/contact.html" style="font-family: var(--ff-philosopher); color: black;">Contact Us</a>
</li>
<!-- Google Translate Element -->
<li class="nav-item" style="display: inline-block;">
<div id="google_element" style="font-family: var(--ff-philosopher); color: black;"></div>
</li>
</ul>
<div class="d-flex" style="justify-content: flex-end;flex-direction: row; margin-left: auto; padding-right: 50px;">
<li class="nav-item" style="list-style-type: none; display: inline-block;">
<a class="nav-btn" href="login.html" style="color: black;">Login</a>
</li>
<li class="nav-item" style="list-style-type: none; display: inline-block;">
<a class="nav-btn" href="signup.html" style="color: black;">Sign Up</a>
</li>
<li class="nav-item" style="list-style-type: none; display: inline-block;">
<a class="nav-btn" href="cart.html" style="color: black;"><i class="fa-solid fa-cart-shopping"></i></a>
</li>
</div>
</nav>
</header>



<div class="mainhead">
<h1 style="color: black;font-family: var(--ff-philosopher);">C A R T</h1>
</div>
</div>
</div>

Expand Down
40 changes: 31 additions & 9 deletions Html-files/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,19 +236,41 @@
<div id="loader"></div>
</div>

<header style=" font-family: Tahoma, sans-serif;background-color: transparent;border-bottom-left-radius: 50px;border-bottom-right-radius: 50px;">
<nav class="navbarbg" style="background-color: transparent;border-bottom-left-radius: 100px;border-bottom-right-radius: 100px;">
<ul id="header-items">
<li><a href="../index.html" style="color: hsl(203, 30%, 26%);">Home</a></li>
<li><a href="menu.html" style="color: hsl(203, 30%, 26%);">About</a></li>
<li><a href="services.html" style="color: hsl(203, 30%, 26%);">Services</a></li>
<li><a href="contact.html" style="color: hsl(203, 30%, 26%);">Contact us</a></li>
<li><a href="cart.html" style="color: hsl(203, 30%, 26%);">Cart</a></li>
<header style="font-family: Tahoma, sans-serif;background-color: transparent;border-bottom-left-radius: 50px;border-bottom-right-radius: 50px;">
<nav class="navbar fixed-top" id="top" style="display: flex; flex-direction: row; background-color: rgb(223, 151, 151); border:0.5rem outset pink; border-radius: 150px; padding-left: 100px; margin-top: 20px;">
<a class="navbar-brand" href="/index.html" style="font-family: var(--ff-philosopher); color: black; font-size: 40px;">Retro</a>
<ul class="navbar-nav" style="display: flex;flex-direction: row; flex-wrap: nowrap; justify-content: space-between; margin-left: 20px;">
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="menu.html" style="font-family: var(--ff-philosopher); color: black;">Collection</a>
</li>
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="services.html" style="font-family: var(--ff-philosopher); color: black;">Services</a>
</li>
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="contact.html" style="font-family: var(--ff-philosopher); color: black;">Contact Us</a>
</li>
<!-- Google Translate Element -->
<li class="nav-item" style="display: inline-block;">
<div id="google_element" style="font-family: var(--ff-philosopher); color: black;"></div>
</li>
</ul>
</nav>
<div class="d-flex" style="justify-content: flex-end;flex-direction: row; margin-left: auto; padding-right: 50px;">
<li class="nav-item" style="list-style-type: none; display: inline-block;">
<a class="nav-btn" href="login.html" style="color: black;">Login</a>
</li>
<li class="nav-item" style="list-style-type: none; display: inline-block;">
<a class="nav-btn" href="signup.html" style="color: black;">Sign Up</a>
</li>
<li class="nav-item" style="list-style-type: none; display: inline-block;">
<a class="nav-btn" href="cart.html" style="color: black;"><i class="fa-solid fa-cart-shopping"></i></a>
</li>
</div>
</nav>

</header>



<!--
<section>
<div class="position-relative overflow-hidden p-0 m-0" style="background-color: transparent;">
Expand Down
36 changes: 28 additions & 8 deletions Html-files/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,17 +260,37 @@
</div>
<div class="head_container" style="background-color: hsl(20, 43%, 93%);">
<header>
<nav class="navbar">
<ul id="header-items">
<li style="font-family: var(--ff-philosopher);"><a href="../index.html" style="color: black;">Home</a></li>
<li style="font-family: var(--ff-philosopher);"><a href="menu.html" style="color: black;">About</a></li>
<li style="font-family: var(--ff-philosopher);"><a href="services.html" style="color: black;">Services</a></li>
<li style="font-family: var(--ff-philosopher);"><a href="contact.html" style="color: black;">Contact us</a></li>
<li style="font-family: var(--ff-philosopher);"><a href="cart.html" style="color: black;">Cart</a></li>
<nav class="navbar fixed-top" id="top" style="display: flex; flex-direction: row; background-color: rgb(223, 151, 151); border:0.5rem outset pink; border-radius: 150px; padding-left: 100px; margin-top: 20px;">
<a class="navbar-brand" href="/index.html" style="font-family: var(--ff-philosopher); color: black; font-size: 40px;">Retro</a>
<ul class="navbar-nav" style="display: flex; flex-wrap: nowrap; justify-content: space-between; margin-left: 20px;">
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="menu.html" style="font-family: var(--ff-philosopher); color: black;">Collection</a>
</li>
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="services.html" style="font-family: var(--ff-philosopher); color: black;">Services</a>
</li>
<li class="nav-item" style="display: inline-block;">
<a class="nav-link" href="contact.html" style="font-family: var(--ff-philosopher); color: black;">Contact Us</a>
</li>
<!-- Google Translate Element -->
<li class="nav-item" style="display: inline-block;">
<div id="google_element" style="font-family: var(--ff-philosopher); color: black;"></div>
</li>
</ul>
</nav>
<div class="d-flex" style="justify-content: flex-end; margin-left: auto; padding-right: 50px;">
<div class="d-flex " style="padding-right: 100px; gap: 12px;">
<li class="nav-item" style="list-style-type: none;font-family: var(--ff-philosopher); "><a class="nav-btn" href="login.html" style="color: black;">Login</a></li>&nbsp;&nbsp;
<li class="nav-item" style="list-style-type: none;font-family: var(--ff-philosopher);"><a class="nav-btn" href="signup.html" style="color: black;">Sign Up</a></li>&nbsp;&nbsp;
<li class="nav-item" style="list-style-type: none;">
<a class="nav-btn " href="cart.html" style="color: black;"><i class="fa-solid fa-cart-shopping"></i></a>
</li>
</div>
</div>
</nav>
</header>



<div class="mainhead">
<h1 style="font-family: var(--ff-philosopher);color: hsl(203, 30%, 26%);">O U R &nbsp; C O L L E C T I O N</h1>
<h1 style="font-family: var(--ff-philosopher);color: hsl(203, 30%, 26%);">
Expand Down
Loading