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

issue #475 Logo addition #586

Closed
wants to merge 5 commits into from
Closed

issue #475 Logo addition #586

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
ed358ff
Added logo.png file
Oct 14, 2024
3f3fdcc
logo.png
Oct 14, 2024
85f8776
Added logo.png file
Oct 14, 2024
092de3a
Add detailed message about the changes
Oct 14, 2024
2aabcf0
Merge branch 'main' into logo-addition
JagritiChopra Oct 20, 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
7 changes: 7 additions & 0 deletions Css-files/about.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
}
.navbar ul {
overflow: hidden;
width:100%;
justify-content: space-between;
background-color: #ebe2e2a2;
}

.navbar li {
Expand All @@ -59,6 +62,10 @@
color: white;
font-size: 1.3rem;
}
.navbar li a img {
width:3.5rem;
height:3.5rem;
}
.navbarbg {
padding: 8px 0;
background-color: hsl(20, 43%, 93%);
Expand Down
18 changes: 18 additions & 0 deletions Css-files/content.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,21 @@ body {
overflow: hidden;
margin: 0; /* Reset margin */
padding: 0; /* Reset padding */

width: 100%; /* Ensures navbar takes up full width */
padding: 0; /* Removes any padding inside the navbar */
margin: 0 auto; /* Centers the navbar if it's inside a container */
display: flex; /* Use flexbox for better alignment */
justify-content: space-between; /* Spreads items evenly */


}

.navbar li {
float: left;
list-style: none;
padding: 8px 20px;
padding-top: 10px;;
}

.navbar li:hover {
Expand Down Expand Up @@ -104,8 +113,17 @@ body {
.navbarbg li:hover {
opacity: 0.7;
}
.navbar {
background-color: #f2e7e7b2;
}


.nav-item a img{
width:3.5rem;
height:3.5rem;
padding:0.2%;
margin-top: 0;
}
.menu_container {
padding: 55px 70px 30px 70px;
background-color: hsl(20, 43%, 93%);
Expand Down
19 changes: 14 additions & 5 deletions Css-files/forgotpass1.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@ body {
height: 100vh;
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100%25' height='100%25' viewBox='0 0 1600 800'%3E%3Cg %3E%3Cpath fill='%23ffb9b0' d='M486 705.8c-109.3-21.8-223.4-32.2-335.3-19.4C99.5 692.1 49 703 0 719.8V800h843.8c-115.9-33.2-230.8-68.1-347.6-92.2C492.8 707.1 489.4 706.5 486 705.8z'/%3E%3Cpath fill='%23ffc1b7' d='M1600 0H0v719.8c49-16.8 99.5-27.8 150.7-33.5c111.9-12.7 226-2.4 335.3 19.4c3.4 0.7 6.8 1.4 10.2 2c116.8 24 231.7 59 347.6 92.2H1600V0z'/%3E%3Cpath fill='%23ffc8bf' d='M478.4 581c3.2 0.8 6.4 1.7 9.5 2.5c196.2 52.5 388.7 133.5 593.5 176.6c174.2 36.6 349.5 29.2 518.6-10.2V0H0v574.9c52.3-17.6 106.5-27.7 161.1-30.9C268.4 537.4 375.7 554.2 478.4 581z'/%3E%3Cpath fill='%23ffcfc6' d='M0 0v429.4c55.6-18.4 113.5-27.3 171.4-27.7c102.8-0.8 203.2 22.7 299.3 54.5c3 1 5.9 2 8.9 3c183.6 62 365.7 146.1 562.4 192.1c198.8 51.8 403.4 40.8 597.3-14.8V0H0z'/%3E%3Cpath fill='%23FFD6CE' d='M181.8 259.4c98.2 6 191.9 35.2 281.3 72.1c2.8 1.1 5.5 2.3 8.3 3.4c171 71.6 342.7 158.5 531.3 207.7c198.8 51.8 403.4 40.8 597.3-14.8V0H0v283.2C59 263.6 120.6 255.7 181.8 259.4z'/%3E%3Cpath fill='%23ffdcd4' d='M1600 0H0v136.3c62.3-20.9 127.7-27.5 192.2-19.2c93.6 12.1 180.5 47.7 263.3 89.6c2.6 1.3 5.1 2.6 7.7 3.9c158.4 81.1 319.7 170.9 500.3 223.2c210.5 61 430.8 49 636.6-16.6V0z'/%3E%3Cpath fill='%23ffe1d9' d='M454.9 86.3C600.7 177 751.6 269.3 924.1 325c208.6 67.4 431.3 60.8 637.9-5.3c12.8-4.1 25.4-8.4 38.1-12.9V0H288.1c56 21.3 108.7 50.6 159.7 82C450.2 83.4 452.5 84.9 454.9 86.3z'/%3E%3Cpath fill='%23ffe6df' d='M1600 0H498c118.1 85.8 243.5 164.5 386.8 216.2c191.8 69.2 400 74.7 595 21.1c40.8-11.2 81.1-25.2 120.3-41.7V0z'/%3E%3Cpath fill='%23ffebe4' d='M1397.5 154.8c47.2-10.6 93.6-25.3 138.6-43.8c21.7-8.9 43-18.8 63.9-29.5V0H643.4c62.9 41.7 129.7 78.2 202.1 107.4C1020.4 178.1 1214.2 196.1 1397.5 154.8z'/%3E%3Cpath fill='%23FFF0EA' d='M1315.3 72.4c75.3-12.6 148.9-37.1 216.8-72.4h-723C966.8 71 1144.7 101 1315.3 72.4z'/%3E%3C/g%3E%3C/svg%3E");
background-size: cover;


}

.home-btn li a img{
width:3.5 rem ;
height:3.5 rem;

}

.circle {
z-index: 998;
width: 20px;
Expand Down Expand Up @@ -53,7 +62,7 @@ body {
text-transform: uppercase;
text-align: center;
}

/*
.home-btn {
position: absolute;
top: 32px;
Expand All @@ -66,11 +75,11 @@ body {
text-decoration: none;
color: rgb(134, 78, 112);
position: relative;
transition: color 0.3s ease; /* Smooth color transition */
transition: color 0.3s ease; /* Smooth color transition
}

.home-btn a:hover {
color: rgb(141, 108, 108); /* Darken color on hover */
color: rgb(141, 108, 108); /* Darken color on hover
}

.home-btn a::after {
Expand All @@ -81,12 +90,12 @@ body {
bottom: -5px;
left: 0;
background-color: transparent;
transition: background-color 0.3s ease; /* Smooth transition */
transition: background-color 0.3s ease; /* Smooth transition
}

.home-btn a:hover::after {
background-color: rgb(141, 108, 108);
}
}*/
.textfield {
width: 100%;
margin-bottom: 15px;
Expand Down
24 changes: 15 additions & 9 deletions Css-files/login1.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ body {
background-size: cover;
}

.nav-link a img {
width:4.5rem;
height:4.5rem;
margin-left: 0;

}
.main-login {
width: 100vw;
height: 100vh;
Expand All @@ -30,7 +36,7 @@ body {
flex-direction: column;
position: relative;
}

/*
.home-btn {
position: absolute;
top: 32px;
Expand All @@ -42,13 +48,13 @@ body {
text-decoration: none;
color: rgb(134, 78, 112);
position: relative;
transition: color 0.3s ease; /* Smooth color transition */
transition: color 0.3s ease; /* Smooth color transition *//*
}

.home-btn a:hover {
color: rgb(141, 108, 108); /* Darken color on hover */
}

color: rgb(141, 108, 108); /* Darken color on hover
}*/
/*
.home-btn a::after {
content: '';
position: absolute;
Expand All @@ -57,13 +63,13 @@ body {
bottom: -5px;
left: 0;
background-color: transparent;
transition: background-color 0.3s ease; /* Smooth transition */
}

transition: background-color 0.3s ease; /* Smooth transition
}*/
/*
.home-btn a:hover::after {
background-color: rgb(141, 108, 108);
}

*/
.left-login > h1 {
color: #e13838;
font-size: 2.5vw;
Expand Down
6 changes: 6 additions & 0 deletions Css-files/navbarstyles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ body {
transition: all 0.3s ease;
}

.nav-bar-nav li a img{
width:3.5rem;
height:3.5rem;

}

.nav-item.dropdown .nav-link {
text-decoration: none;
/* No underline for dropdown toggle */
Expand Down
20 changes: 18 additions & 2 deletions Html-files/Electronic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,16 @@
height: 30px;
}

.navbar{
background-color: rgba(238, 246, 253, 0.657);
padding:0;
}

.navbar ul {
overflow: hidden;
display: flex;
justify-content: center;
width:100%;
}

.navbar li {
Expand All @@ -173,6 +179,12 @@
font-size: 1.3rem;
font-family: var(--ff-philosopher);
}
.navbar li a img{
width:3.5rem;
height:3.5rem;
margin-top: 0;
margin-bottom: 0;
}

.wrapper {
width: 100%;
Expand Down Expand Up @@ -530,6 +542,7 @@
<title>Retro</title>
</head>
<body>

<div class="circle-container">
<div
class="circle"
Expand Down Expand Up @@ -724,13 +737,13 @@
<header style="font-family: var(--ff-philosopher)">
<nav class="navbar navbar-expand-lg fixed-top" id="top">
<div class="container-fluid">
<a
<!--<a
class="navbar-brand"
href="../index.html"
style="font-family: var(--ff-philosopher); color: black"
>
<b>Retro</b>
</a>
</a>-->
<button
class="navbar-toggler"
type="button"
Expand All @@ -744,6 +757,9 @@
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="../index.html"> <img src="logo.png" width: 3.5rem ; height:3.5rem; > </a>
</li>
<li class="nav-item">
<a class="nav-link" href="../index.html" style="color: black"
>Home</a
Expand Down
7 changes: 5 additions & 2 deletions Html-files/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,16 +587,19 @@
<header style="font-family: var(--ff-philosopher);">
<nav class="navbar navbar-expand-lg fixed-top" id="top">
<div class="container-fluid">
<a class="navbar-brand" href="/index.html" style="font-family: var(--ff-philosopher); color: black;">
<!--<a class="navbar-brand" href="/index.html" style="font-family: var(--ff-philosopher); color: black;">
<b>Retro</b>
</a>
</a>-->
<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 me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="../index.html"> <img src="logo.png"> </a>
</li>
<li class="nav-item">
<a class="nav-link" href="../index.html" style="color: black;">Home</a>
</li>
<li class="nav-item">
Expand Down
10 changes: 10 additions & 0 deletions Html-files/booknow.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,20 @@
.description{
color: white !important;
}
.nav-link{
img{
width:5.5rem;
height:5.5rem;
}
}
</style>
</head>
<body>
<header>

<a class="nav-link" href="../index.html">
<img src="logo.png"> </a>

<h1>Retro</h1>
<p style="color: white;">Celebrating Vintage Elegance</p>
</header>
Expand Down
8 changes: 7 additions & 1 deletion Html-files/cart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,15 +323,21 @@
<header>
<nav class="navbar navbar-expand-lg fixed-top">
<div class="container-fluid">
<!--<li class="nav-item">
<a class="nav-link" href="../index.html"> <img src="C:\Users\hp\Pictures\Screenshots\logo.png"> </a>
</li>
<a class="navbar-brand" href="../index.html" style="color: black;">
<b>Retro</b>
</a>
</a>-->
<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 me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="../index.html"> <img src="logo.png"> </a>
</li>
<li class="nav-item">
<a class="nav-link" href="../index.html" style="color: black;">Home</a>
</li>
Expand Down
8 changes: 6 additions & 2 deletions Html-files/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,16 +544,20 @@
<header>
<nav class="navbar navbar-expand-lg fixed-top">
<div class="container-fluid">
<a class="navbar-brand" href="../index.html" style="color: black;">
<!--<a class="navbar-brand" href="../index.html" style="color: black;">
<b>Retro</b>
</a>
</a>-->

<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 me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="../index.html"> <img src="logo.png"> </a>
</li>
<li class="nav-item">
<a class="nav-link" href="../index.html" style="color: black;">Home</a>
</li>
Expand Down
7 changes: 7 additions & 0 deletions Html-files/contributor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,16 @@
.top-btn:hover {
background-color: #f689f2;
}
.nav-link img {
width:3.5rem;
height:3.5rem;
}
</style>
</head>
<body>
<nav >
<a class="nav-link" href="../index.html"> <img src="logo.png"> </a>
</nav>
<div class="container">
<div class="toggle-container aos-init aos-animate" data-aos="fade-down">
<input id="themeToggle" class="toggle" type="checkbox" />
Expand Down
8 changes: 7 additions & 1 deletion Html-files/forgot-pass.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@
<div class="circle" style="background-color: rgb(104, 0, 96) !important; left: 504px; top: 59px; scale: 0.1;"></div>
<div class="circle" style="background-color: rgb(96, 0, 95) !important; left: 504px; top: 59px; scale: 0.05;"></div>
</div>
<div class="home-btn"><a href="../index.html" style="font-family: var(--ff-philosopher);"><b>Retro</b></a></div>
<div class="home-btn">
<!--- <a href="../index.html" style="font-family: var(--ff-philosopher);"><b>Retro</b></a>-->
<li class="nav-item">
<a class="nav-link" href="../index.html"> <img src="logo.png"> </a>
</li>

</div>
<div class="container">
<div class="card-forgot">
<h1>Forgot Password</h1>
Expand Down
10 changes: 10 additions & 0 deletions Html-files/logged.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
<link href="https://fonts.googleapis.com/css2?family=Philosopher:ital,wght@0,400;0,700;1,400;1,700&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
<style>
@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');

.logo a img{
width: 5.5rem;
height:5.5rem;
align-self: center;
margin-top:1%;
}
#sr {
display: none;
position: fixed;
Expand Down Expand Up @@ -63,6 +70,9 @@
</style>
</head>
<body>
<div class="logo">
<a class="nav-link" href="../index.html"> <img src="logo.png"> </a>
</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>
Expand Down
Loading