Skip to content

Commit

Permalink
conflict solved
Browse files Browse the repository at this point in the history
  • Loading branch information
deaselWeasel committed Nov 20, 2023
1 parent 481ac3f commit 2164bb7
Show file tree
Hide file tree
Showing 8 changed files with 282 additions and 134 deletions.
Binary file added .DS_Store
Binary file not shown.
332 changes: 239 additions & 93 deletions neo_dolfin/static/css/registration.css
Original file line number Diff line number Diff line change
@@ -1,94 +1,240 @@
body {
background-image: url("data:image/svg+xml,%3Csvg width='52' height='26' viewBox='0 0 52 26' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cg fill='%23464df3' fill-opacity='0.16'%3E%3Cpath d='M10 10c0-2.21-1.79-4-4-4-3.314 0-6-2.686-6-6h2c0 2.21 1.79 4 4 4 3.314 0 6 2.686 6 6 0 2.21 1.79 4 4 4 3.314 0 6 2.686 6 6 0 2.21 1.79 4 4 4v2c-3.314 0-6-2.686-6-6 0-2.21-1.79-4-4-4-3.314 0-6-2.686-6-6zm25.464-1.95l8.486 8.486-1.414 1.414-8.486-8.486 1.414-1.414z' /%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
max-height: 100vh !important;
font-size: 1.6rem;
}
.display_left
{
width: 800px;

}
.display_right
{
width: 1000px;


}
.signup_bg {
width: auto;
height: 755px;
opacity: 0.7;
margin-top: 25px;
margin-left: 240px;
}
.Title_signup {
width: 300px;
height: auto;
margin-top: 10px;
margin-left: 10px;
}
.style {
width: 1200px;
height:auto;
opacity: 0.9;
margin-top: -80px;
margin-left:-100px;
}
.text_bg
{
position: absolute;
top: 270px;
left: 0;
width: 750px;
height: 450px;
background-color: rgba(238, 236, 236, 0.7);
display: flex;
backdrop-filter: blur(15px);
border-radius: 20px;
}
.container_right
{
position: relative;
max-width: 800px;
margin: 0 auto;
}
.container_left
{
position: relative;
max-width: 1000px;
margin: 0 auto;
}
.text_mid{
color: #000;
font-family: Anek Gujarati;
font-size: 30px;
font-style: normal;
font-weight: 400;
line-height: normal;
}
.text_top
{
position: absolute;
top: 150px;
color: #FFF;
font-family: Arimo Hebrew Subset Italic;
font-size: 30px;
font-style: italic;
font-weight: 700;
line-height: normal;
}
.dolfin
{
position: absolute;
top: 600px;
left: 600px;
width: 250px;
display: flex;

}
.input_area
{
position: absolute;
top: 300px;
left: 300px;
body {
background-image: url("/Users/amen/Desktop/Dolfin/Neo_Dolfin/neo_dolfin/static/img/bg-img.png"); /* Your existing SVG background */
font-size: 1.6rem;
font-family: "Inter", sans-serif;
background-color: #FAFAFE;
overflow-x: hidden;
display: flex;
align-items: center;
justify-content: center;
}



.signup_bg {
height: 755px;
opacity: 0.7;
margin-top: 25px;
}

.Title_signup {
width: 300px;
height: auto;
margin-top: 10px;
text-align: center;
font-weight: bold;
color: #000;
}

.style {
height: auto;
opacity: 0.9;
margin-top: -80px;
}

.text_bg {
position: absolute;
top: 270px;
width: 600px;
height: 310px;
background: rgba(238, 236, 236, 0.7);
box-shadow: 5px 6px 20px 0px rgba(0, 0, 0, 0.25);
backdrop-filter: blur(15px);
border-radius: 50px;
display: flex;
}


.container_right, .container_left {
position: relative;
margin: 0 auto;
color: #FFF;
}


.text_mid {
color: black;
font-family: 'Anek Gujarati', sans-serif;
font-size: 24px;
font-weight: 400;
padding-top: 50px;
}
.top-right-image {
position: fixed;
top: 0;
right: 0;
width: 900px;
height: 600px;
z-index: 0;
}
@media (max-width: 768px) {
.top-right-image {
width: 50px;
}
}

.text_top {
position: absolute;
top: 150px;
color: #FFF;
font-family: 'Arimo Hebrew Subset Italic', sans-serif;
font-size: 30px;
font-style: italic;
font-weight: 700;
}

.dolfin {
position: absolute;
top: 600px;
left: 500px;
width: 150px;
transform: translateY(-80%);
}

.Subtitle {
color: #AEAEAE;
text-align: center;
font-family: 'Anek Gujarati', sans-serif;
font-size: 0.8em;
margin-top: 2em;
margin-bottom: 1em;
}

.input_area {
position: relative;
background: rgba(220, 231, 235, 0.44);
padding: 40px;
box-shadow: 5px 6px 20px 0px rgba(0, 0, 0, 0.25);
border-radius: 50px;
backdrop-filter: blur(40.7px);
display: flex;
flex-direction: column;
align-items: center;
width: auto;
max-width: 55%;
margin-left: auto;
margin-right: auto;
}

body, html {
height: 100%;
}

.container-fluid {
position: relative;
min-height: 100%;
}


.text-under-container {
position:absolute;
color: #585858;
font-family: 'Anek Gujarati', sans-serif;
padding: 20px;
padding-top: 490px;
margin-left: 470px;
text-align: center;
font-size: 20px;
}






input[type="text"],
input[type="email"],
input[type="password"] {
font-family: 'Anybody', sans-serif;
color: rgba(12, 12, 12, 0.30);
font-size: 22px;
font-weight: 700;
width: 90%;
padding: 10px;
margin: 10px;
border: 1px solid #ddd;
border-radius: 15px;
}

input[type="submit"] {
width: 40%;
padding: 5px;
font-size: 0.7em;
border: none;
border-radius: 5px;
background-color: #0077BA;
color: white;
font-weight: bold;
cursor: pointer;
margin-top: 25px;
margin-left: 90px;
margin-right: center;
}

.or-text {
text-align: center;
margin-top: 20px;
color: #000;
font-family: 'Anybody', sans-serif;
font-size: 22px;
font-weight: 700;
}

.social-login {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 20px;
}

.btn-google, .btn-microsoft {
display: flex;
align-items: center;
justify-content: center;
padding: 10px 20px;
border: none;
border-radius: 5px;
cursor: pointer;
background-color: #ffffff;
color: rgb(29, 28, 28);
font-size: 0.5em;
font-weight: bold;
margin: 5px 0;
white-space: nowrap;
position: relative;
width: 135%;
}

.btn-logo {
position: absolute;
left: 10px;
height: 20px;
width: 20px;
}


.btn-google, .btn-microsoft {
padding-left: 40px;
}







@media (min-width: 992px) and (max-width: 1903px) {

}

@media (min-width: 768px) and (max-width: 992px) {

}

@media (max-width: 768px) {
.display_right, .signup_bg, .style, .text_bg, .container_right, .dolfin {
display: none;
}


}
Binary file added neo_dolfin/static/img/Title.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added neo_dolfin/static/img/dolfin .png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added neo_dolfin/static/img/googl.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added neo_dolfin/static/img/msft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified neo_dolfin/static/img/title.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2164bb7

Please sign in to comment.