Skip to content

Commit

Permalink
Merge branch 'main' into updated-navbar
Browse files Browse the repository at this point in the history
  • Loading branch information
@Anjaliavv51
Anjaliavv51 authored Oct 5, 2024
2 parents defcd0a + e550c09 commit 5bd3b0e
Show file tree
Hide file tree
Showing 8 changed files with 163 additions and 115 deletions.
2 changes: 1 addition & 1 deletion Css-files/about.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,4 +561,4 @@
margin-top: 5px;
}



3 changes: 3 additions & 0 deletions Css-files/content.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,9 @@ div.deals:hover{
color: brown !important;
}

.deals:hover p a{
color: brown !important;
}
.deals p{
font-size: 1.1rem;
padding-top: 2px;
Expand Down
25 changes: 24 additions & 1 deletion Css-files/login1.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,31 @@ body * {
justify-content: center;
align-items: center;
flex-direction: column;
position: relative;
}
.home-btn{
position: absolute;
top:32px;
left:30px;
}
.home-btn a{
font-size: 30px;
text-decoration: none;
color:rgb(149, 15, 95);
}
.home-btn a::after {
content: ''; /* Creates a pseudo-element */
position: absolute;
width: 100%; /* Full width of the link */
height: 1.5px; /* Thickness of the underline */
bottom: -5px;
left: 0;
background-color: transparent; /* Default background (invisible) */
transition: background-color 0.1s ease; /* Smooth transition */
}
.home-btn a:hover::after{
background-color:white;
}

.left-login > h1 {
color: #e13838;
font-size: 2.5vw;
Expand Down
203 changes: 105 additions & 98 deletions Css-files/signup1.css
View file
Original file line number Diff line number Diff line change
@@ -1,146 +1,153 @@
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400;700&display=swap');

body {
margin: 0;
:root {
--primary-color: #e13838;
--input-bg: #ffe6e9;
--input-border: #ff8ca1;
--btn-color: #be367a;
--hover-color: #e75480;
--btn-text-color: #ffffff;
--card-bg: rgba(255, 255, 255, 0.95); /* Semi-transparent white for card background */
--box-shadow: 0px 10px 20px rgba(0, 0, 0, 0.1); /* Soft shadow for card */
--transition-speed: 0.3s; /* Transition speed for effects */
--border-radius: 10px; /* Consistent border radius */
}

body * {
box-sizing: border-box;
}
body{
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.1c186.7 43.7 376.3 34.4 557.9-12.6V0H0z'/%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");
body {
margin: 0;
font-family: 'Noto Sans', sans-serif;
background: linear-gradient(135deg, #ffb6c1, #ff69b4);
background-size: cover;
}
:root{
--ff-philosopher: "Philosopher", sans-serif;
--ff-poppins: "Poppins", sans-serif;
}
.main-login {
width: 100vw;
height: 100vh;
background-attachment: fixed;
display: flex;
justify-content: center;
align-items: center;
height: 100vh; /* Full viewport height */
padding: 20px; /* Padding to avoid overflow */
overflow: hidden; /* Prevents overflow */
position:relative;
}

.left-login {
width: 50vw;
height: 100vh;
.main-login {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
width: 100%;
overflow: hidden; /* Ensure nothing overflows from the flexbox */
}

.left-login > h1 {
color: #e13838;
font-size: 2.5vw;
.homebtn{
position: absolute;
top:30px;
left:25px;
}

.left-login-image {
width: 35vw;
.homebtn a{
font-size: 30px;
text-decoration: none;
}

.right-login {
width: 50vw;
height: 100vh;
display: flex;
justify-content: center;
align-items: center;
.homebtn a::after {
content: ''; /* Creates a pseudo-element */
position: absolute;
width: 100%; /* Full width of the link */
height: 1.5px; /* Thickness of the underline */
bottom: -5px;
left: 0;
background-color: transparent; /* Default background (invisible) */
transition: background-color 0.1s ease; /* Smooth transition */
}
.homebtn a:hover::after{
background-color:white;
}

.card-login {
width: 60%;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
padding: 30px 35px;
border-radius: 20px;
box-shadow: 0px 10px 40px #00000056;
width: calc(100% - 40px); /* Full width minus padding */
max-width: 400px; /* Max width for better layout */
padding: 30px;
border-radius: var(--border-radius);
box-shadow: var(--box-shadow);
background-color: var(--card-bg);
transition: transform var(--transition-speed), box-shadow var(--transition-speed);
display: flex; /* Flex to stack elements */
flex-direction: column; /* Column layout for the card */
overflow: hidden; /* Added to ensure no content spills out */
}

.card-login > h1 {
color: #e13838;
font-weight: 800;
margin: 0;
.card-login:hover {
transform: translateY(-4px); /* Lift effect on hover */
box-shadow: 0px 15px 25px rgba(0, 0, 0, 0.15); /* More pronounced shadow on hover */
}

.card-login h1 {
font-size: 2.5rem; /* Larger font size for the title */
color: var(--primary-color);
text-align: center; /* Centered title */
margin-bottom: 20px;
text-transform: uppercase; /* Uppercase for modern touch */
letter-spacing: 1px; /* Spacing between letters */
}

.textfield {
width: 100%;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: center;
margin: 10px 0px;
margin-bottom: 15px; /* Add margin to space fields */
display: flex; /* Flex for better layout */
flex-direction: column; /* Column layout for input and label */
}

.textfield label {
font-weight: 700; /* Bold label for clarity */
margin-bottom: 5px; /* Space between label and input */
color: #555; /* Slightly darker color for the label */
}

.textfield > input {
width: 100%;
border: none;
border-radius: 10px;
padding: 15px;
color: #030707de;
font-size: 12pt;
box-shadow: 0px 10px 40px #00000056;
outline: none;
box-sizing: border-box;
}

.textfield > label {
color: #f0ffffde;
margin-bottom: 10px;
background-color: var(--input-bg);
border: 2px solid transparent;
border-radius: var(--border-radius); /* Consistent rounded corners */
transition: border var(--transition-speed), box-shadow var(--transition-speed);
font-size: 1rem;
color: #333;
box-sizing: border-box; /* Ensures padding doesn't affect input width */
}

.textfield > input::placeholder {
color: #000000;
.textfield > input:focus {
border-color: var(--input-border);
box-shadow: none; /* Remove unwanted glow or shadow */
}

.btn-login, #google-login {
width: 100%;
padding: 16px 0;
padding: 16px;
margin: 10px 0;
background-color: var(--btn-color);
color: var(--btn-text-color);
font-weight: bold;
border: none;
border-radius: 8px;
outline: none;
text-transform: uppercase;
font-weight: 800;
letter-spacing: 3px;
color: #bec44b;
background: white;
border-radius: var(--border-radius);
cursor: pointer;
box-shadow: 0px 10px 40px -12px #ddd;
transition: background-color var(--transition-speed), box-shadow var(--transition-speed), transform var(--transition-speed);
letter-spacing: 1.5px;
width: 100%; /* Full width for buttons */
}

@media only screen and (max-width: 950px) {
.card-login {
width: 85%;
}
.btn-login:hover, #google-login:hover {
background-color: var(--hover-color);
box-shadow: 0px 15px 45px -10px rgba(0, 0, 0, 0.2);
transform: scale(1.03);
}

.btn-login:focus, #google-login:focus {
outline: 2px solid var(--hover-color); /* Add focus outline */
outline-offset: 3px;
}

/* Responsive design for smaller screens */
@media only screen and (max-width: 600px) {
.main-login {
flex-direction: column;
}

.left-login > h1 {
display: none;
}

.left-login {
width: 100%;
height: auto;
}

.right-login {
width: 100%;
height: auto;
}

.left-login-image {
width: 40vh;
padding: 0 20px; /* Added padding to avoid edge overflow */
}

.card-login {
width: 90%;
width: 100%; /* Full width for mobile */
padding: 20px; /* Adjust padding */
}
}
28 changes: 15 additions & 13 deletions Html-files/cart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,19 +280,21 @@
<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);">Collections</a></li>
<li><a href="about.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="head_container" style="background-color: transparent;font-family: Georgia;">
<header>
<nav class="navbar">
<ul id="header-items">
<!-- Updated link to index.html from Home.html and removed redundant copy of head_container from below -->
<li><a href="../index.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);">Collections</a></li>
<li><a href="about.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 <span
class="badge-count" id="badgeCount"></span></a></li>
</ul>
</nav>
</header>

<div class="mainhead">
<h1 style="color: black;font-family: var(--ff-philosopher);">C A R T</h1>
Expand Down
1 change: 1 addition & 0 deletions Html-files/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
</div>
<div class="main-login">
<div class="left-login" style="background-color: transparent;">
<div class="home-btn"><a href="../index.html" style="font-family: var(--ff-philosopher);"><b>Retro</b></a></div>
<div class="container">
<div class="card">
<div class="front" style="align-content: center;font-family: var(--ff-philosopher);">
Expand Down
13 changes: 11 additions & 2 deletions Html-files/services.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,15 @@
transform: rotate(360deg);
}
}

.deals:hover {
background-color: hsl(203, 30%, 95%); /* Optional: change background on hover */
}

.deals:hover p {
color: hsl(203, 30%, 50%); /* Change to a darker color for contrast on hover */
color: hsl(203, 30%, 50%);
}
</style>

</head>
Expand Down Expand Up @@ -412,15 +421,15 @@ <h1 style="font-family: var(--ff-philosopher);color: hsl(203, 30%, 26%);">S E R
<div class="second_cont" style="font-family: Garamond;">
<div class="deals">
<i class="fa-solid fa-gift"></i>
<p
<p class="dealsp"
style="font-family: var(--ff-philosopher);color: hsl(203, 30%, 26%);"><a
href="./payment2.html"
style="text-decoration: none;color: black;">Gift
Card and Voucher Redemption</a></p>
</div>
<div class="deals">
<i class="fa-solid fa-ticket"></i>
<p
<p class="dealsp"
style="font-family: var(--ff-philosopher);color: hsl(203, 30%, 26%);"><a
href="./payment2.html"
style="text-decoration: none;color: black;">Exclusive
Expand Down
3 changes: 3 additions & 0 deletions Html-files/signup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@
<div class="circle" style="background-color: rgb(96, 0, 95); left: 504px; top: 59px; scale: 0.05;"></div>
</div>
<div class="main-login">
<div class="homebtn">
<a href="../index.html" style="font-family: var(--ff-philosopher); color: rgb(149, 15, 95);"><b>Retro</b></a>
</div>
<div class="left-login">
<div class="area">
<div class="way"></div>
Expand Down

0 comments on commit 5bd3b0e

Please sign in to comment.