Skip to content

Commit

Permalink
Merge pull request PRIYESHSINGH24#644 from rupeshv2121/main
Browse files Browse the repository at this point in the history 
Fixed UI of Login and Signup And Remove overflow-x and Add Desired ro…
  • Loading branch information
@PRIYESHSINGH24
PRIYESHSINGH24 authored Jan 27, 2025
2 parents ab2251e + be51d3c commit 0a100c6
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 78 deletions.
4 changes: 2 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
transform: translate(0px, 0px);
"
>
<a href="#home" class="active">Home</a>
<a href="index.html" class="active">Home</a>
</li>
<li
style="
Expand Down Expand Up @@ -148,7 +148,7 @@
transform: translate(0px, 0px);
"
>
<a href="pages/Login.html">Log In</a>
<a href="./pages/Login.html">Log In</a>
</li>
<li
style="
Expand Down
7 changes: 3 additions & 4 deletions pages/Login.css
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* General Body Styling */
body {
font-family: 'Poppins', sans-serif;
background: linear-gradient(to top right, #80ff00, #07922a);
background: linear-gradient(to top right, #80ff00, #94d7a5);
color: #ffffff; /* Keeps text readable against the green */
margin: 0;
padding: 0;
Expand Down Expand Up @@ -216,7 +216,7 @@ body {
width: 70vw;
max-width: 420px;
padding: 2.5rem;
background: #f5f5dc; /* Earthy beige tone */
background: #eaffab;
border-radius: 24px;
box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.3);
backdrop-filter: blur(10px);
Expand Down Expand Up @@ -278,7 +278,6 @@ body {
.input-field {
width: 93%;
padding: 1rem;
background: var(--input-bg);
border: 1px solid var(--border);
border-radius: 12px;
color: var(--text-primary);
Expand Down Expand Up @@ -446,7 +445,7 @@ body {
}

.form-main{
width: 100vw;
/* width: 100vw; */
display: flex;
justify-content: center;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion pages/Login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</svg>
</button>
<ul class="nav-links">
<li><a href="../" class="active">Home</a></li>
<li><a href="../index.html" class="active">Home</a></li>
<li><a href="platform.html">Platforms</a></li>
<li><a href="/about.html">About</a></li>
<li><a href="/contact.html">Contact</a></li>
Expand Down
207 changes: 136 additions & 71 deletions pages/SignUp.html
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,72 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<meta property="og:image" content="../img/lightlogo.png" />
<meta property="og:url" content="https://priyeshsingh24.github.io/DSA_SOLUTION_PLATFORM/" />
<meta
property="og:url"
content="https://priyeshsingh24.github.io/DSA_SOLUTION_PLATFORM/"
/>
<meta property="og:type" content="website" />

<link rel="icon" href="../img/lightlogo.png" type="image/png" />
<link rel="icon" href="../img/lightlogo.png" sizes="16x16" type="image/png" />

<link
rel="icon"
href="../img/lightlogo.png"
sizes="16x16"
type="image/png"
/>

<link rel="stylesheet" href="login.css">
<link rel="stylesheet" href="login.css" />

<title>SIGN UP</title>
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" rel="stylesheet">
<link rel="stylesheet" href="../navbar.css">
</head>
<Style>
.form-main
{
margin-top:40px;
<link
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css"
rel="stylesheet"
/>
<link rel="stylesheet" href="../navbar.css" />
</head>
<style>
.form-main {
margin-top: 40px;
}
</Style>
<body>
</style>
<body>
<nav class="navbar">
<div class="logo">

<div class="logo">
<img src="../img/logo2.png" alt="Logo" />
</div>

<<<<<<< HEAD
<button class="mobile-menu-btn">
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
stroke="black"
>
<line x1="3" y1="12" x2="21" y2="12"></line>
<line x1="3" y1="6" x2="21" y2="6"></line>
<line x1="3" y1="18" x2="21" y2="18"></line>
</svg>
</button>
<ul class="nav-links">
<li><a href="../index.html">Home</a></li>
<li><a href="../platform.html">Platforms</a></li>
<li><a href="../about.html">About</a></li>
<li><a href="../contact.html">Contact</a></li>
<li><a href="Login.html">Log In</a></li>
<li><a href="./SignUp.html">Sign Up</a></li>
</ul>
</nav>
=======

<img src="../img/logo2.png" alt="Logo" />

Expand All @@ -51,59 +88,87 @@
<li><a href="./SignUp.html">Sign Up</a></li>
</ul>
</nav>
>>>>>>> ab2251e5886a53ca9eab85cd5b939a6ea270b715
<!-- Sign Up Form -->
<div class="form-main">
<div id="signUpForm" class="auth-container">
<div class="auth-header">
<h2 class="auth-title">Create an account</h2>
<p class="auth-subtitle">Sign up to get started</p>
</div>

<form id="signUpFormSubmit">
<div class="input-group">
<label class="input-label" for="fullName">Full Name</label>
<input type="text" id="fullName" class="input-field" placeholder="Enter your full name" required>
</div>

<div class="input-group">
<label class="input-label" for="signUpEmail">Email</label>
<input type="email" id="signUpEmail" class="input-field" placeholder="name@company.com" required>
</div>

<div class="input-group">
<label class="input-label" for="signUpPassword">Password</label>
<input type="password" id="signUpPassword" class="input-field" placeholder="Enter your password"
required>
</div>

<div class="input-group">
<label class="input-label" for="confirmPassword">Confirm Password</label>
<input type="password" id="confirmPassword" class="input-field" placeholder="Confirm your password"
required>
</div>

<div id="error-message" class="error-message"></div>

<button type="submit" class="submit-btn">Sign Up</button>

<div class="auth-divider">
<span>Or continue with</span>
</div>

<div class="social-signin">
<button type="button" class="social-btn"><i class="fa-brands fa-google"></i></button>
<button type="button" class="social-btn"><i class="fa-brands fa-github"></i></button>
</div>

<div class="auth-footer">
Already have an account?
<a href="Login.html" id="switchToSignIn" class="auth-link">Sign In</a>
</div>
</form>
<div id="signUpForm" class="auth-container">
<div class="auth-header">
<h2 class="auth-title">Create an account</h2>
<p class="auth-subtitle">Sign up to get started</p>
</div>
</div>

</body>

<form id="signUpFormSubmit">
<div class="input-group">
<label class="input-label" for="fullName">Full Name</label>
<input
type="text"
id="fullName"
class="input-field"
placeholder="Enter your full name"
required
/>
</div>

<div class="input-group">
<label class="input-label" for="signUpEmail">Email</label>
<input
type="email"
id="signUpEmail"
class="input-field"
placeholder="name@company.com"
required
/>
</div>

<div class="input-group">
<label class="input-label" for="signUpPassword">Password</label>
<input
type="password"
id="signUpPassword"
class="input-field"
placeholder="Enter your password"
required
/>
</div>

<div class="input-group">
<label class="input-label" for="confirmPassword"
>Confirm Password</label
>
<input
type="password"
id="confirmPassword"
class="input-field"
placeholder="Confirm your password"
required
/>
</div>

<div id="error-message" class="error-message"></div>

<button type="submit" class="submit-btn">Sign Up</button>

<div class="auth-divider">
<span>Or continue with</span>
</div>

<div class="social-signin">
<button type="button" class="social-btn">
<i class="fa-brands fa-google"></i>
</button>
<button type="button" class="social-btn">
<i class="fa-brands fa-github"></i>
</button>
</div>

<div class="auth-footer">
Already have an account?
<a href="Login.html" id="switchToSignIn" class="auth-link"
>Sign In</a
>
</div>
</form>
</div>
</div>
</body>
</html>

0 comments on commit 0a100c6

Please sign in to comment.