Skip to content

Commit

Permalink
Merge pull request #140 from aasthakourav20/colorchange
Browse files Browse the repository at this point in the history
color combinations maintained
  • Loading branch information
Sahil1786 committed Jun 3, 2024
2 parents f465730 + a5c0118 commit 3039dd1
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 26 deletions.
2 changes: 1 addition & 1 deletion public/css/Ngo_login.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;500&display=swap');

body{
font-family: 'Poppins', sans-serif;
font-family:'Times New Roman', Times, serif ;
background: #ececec;
}

Expand Down
2 changes: 1 addition & 1 deletion public/css/admin_css.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;500&display=swap');

body{
font-family: 'Poppins', sans-serif;
font-family:'Times New Roman', Times, serif ;
background: #ececec;
}

Expand Down
37 changes: 20 additions & 17 deletions public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ body{
padding: 0;
font-family: 'Poppins', sans-serif;
}
.logo_name{
font-family: 'Poppins', sans-serif;
.logo_name{ font-family:'Times New Roman', Times, serif ;
margin-right: 270px;
font-weight: 700;
color:rgb(0, 255, 64);
color:rgb(40, 94, 53);
font-size: 45px;
transition: all 0.3s;
margin-top: 12px !important;
Expand All @@ -39,23 +38,24 @@ body{
}
.hero_text{
color: #353535;
font-family: 'Poppins', sans-serif;
font-family:'Times New Roman', Times, serif ;
font-weight: 400;
font-size: 40px;
margin-bottom: 5px;
margin-left: 150px;
text-shadow: 0ic;
}
.hero_text2{
color: #353535;
font-family: 'Poppins', sans-serif;
font-family:'Times New Roman', Times, serif ;
font-weight: 900;
font-size: 70px;
margin-left: 150px;
}
.hero_text3{
color: #353535;
display: flex;
font-family: 'Poppins', sans-serif;
font-family:'Times New Roman', Times, serif ;
font-weight: 400;
font-size: 20px;
margin-left: 150px;
Expand All @@ -71,8 +71,8 @@ body{
margin-left: 150px;
font-size: 20px;
padding: 9px 25px ;
background-color: rgba(0, 136, 169, 1);
border-radius: 50px;
background-color: rgb(115, 202, 224);
border-radius: 70px;
border: none;
cursor:pointer ;
margin-top: 10px;
Expand Down Expand Up @@ -149,7 +149,7 @@ section .title{
font-weight: 500;
margin-bottom: 60px;
padding-bottom: 20px;
font-family: 'Ubuntu', sans-serif;
font-family:'Times New Roman', Times, serif ;
}
/* section .title::before{
content: "";
Expand All @@ -165,11 +165,14 @@ section .title{
position: absolute;
bottom: -8px;
left: 50%;
font-size:15px;
color: crimson;
font-size:20px;
color: rgb(123, 20, 41);
padding: 0 5px;
background: #fff;
background: #ebbfbf;
transform: translateX(-50%);
font-family: 'Times New Roman', Times, serif;
font-weight: 200;
}
*/

Expand Down Expand Up @@ -246,7 +249,7 @@ section .title{
.contact .contact-content .row i{
display: flex;
font-size: 25px;
color: crimson;
color: rgb(104, 21, 38);
width: 10px;
}
.contact .contact-content .info .head{
Expand Down Expand Up @@ -280,7 +283,7 @@ section .title{
outline: none;
padding: 0 15px;
font-size: 17px;
font-family: 'Poppins', sans-serif;
font-family:'Times New Roman', Times, serif ;
transition: all 0.3s ease;
}
.contact .right form .field input:focus,
Expand All @@ -306,8 +309,8 @@ section .title{
border-radius: 6px;
cursor: pointer;
flex-wrap: nowrap;
background: crimson;
border: 2px solid crimson;
background: rgb(135, 33, 54);
border: 2px solid rgb(126, 34, 52);
transition: all 0.3s ease;
} */

Expand All @@ -324,7 +327,7 @@ footer{

}
footer span a{
color: crimson;
color: rgb(170, 31, 59);
text-decoration: none;
}
footer span a:hover{
Expand Down
2 changes: 1 addition & 1 deletion public/css/user_css.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;500&display=swap');

body{
font-family: 'Poppins', sans-serif;
font-family:'Times New Roman', Times, serif ;
background: #ececec;
}

Expand Down
3 changes: 1 addition & 2 deletions public/css/user_singup.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
margin: 0;
padding: 0;
box-sizing: border-box;
font-family: "Poppins", sans-serif;
font-family:'Times New Roman', Times, serif ;
}


body {
min-height: 100vh;
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion views/comfirm.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
body {
font-family: 'poppins', sans-serif;
background-color: #106fde;
background-color: #2b6db9;
margin: 0;
padding: 0;
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions views/forget-password.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
font-family: 'poppins', sans-serif;
}
.wrapper{
background-color: #106fde;
background-color: #4281c8;
width: 100%;
height: 100vh;
padding: 15px;
Expand Down Expand Up @@ -90,7 +90,7 @@
}
.submit-btn{
width: 100%;
background-color: #106fde;
background-color: #3a76ba;
border: 1px solid transparent;
border-radius: 8px;
font-size: 16px;
Expand Down
4 changes: 3 additions & 1 deletion views/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<section class="hero">
<div class="content">
<h1 class="hero_text">WELCOME</h1>
<h2 class="hero_text2">TO PETARI</h2>
<h2 class="hero_text2">TO PETARI!!</h2>
<p class="hero_text3"> "Hunger is not a problem. It is an obscenity.
</p>
<p class="hero_text3">How wonderful it is
Expand Down Expand Up @@ -92,8 +92,10 @@
2020, India ranked 94th out of 107 countries with a score of 27.2 indicating a “Serious”
hunger situation prevailing in the Nation. </p>
<br>

<h3> Our Vision : </h3>
<p>

To bring a social change in every individual in-order to reduce food waste and to make the
World Hunger Free.</p>

Expand Down

0 comments on commit 3039dd1

Please sign in to comment.