Skip to content

Commit

Permalink
Merge branch 'main' into feature/new-feature1
Browse files Browse the repository at this point in the history
  • Loading branch information
Varsha-1605 authored Oct 15, 2024
2 parents 6a5ed97 + 594b819 commit dabf53a
Show file tree
Hide file tree
Showing 41 changed files with 3,726 additions and 2,972 deletions.
Binary file added .DS_Store
Binary file not shown.
1,320 changes: 126 additions & 1,194 deletions Coverpage.html

Large diffs are not rendered by default.

58 changes: 30 additions & 28 deletions Css-files/about.css
Original file line number Diff line number Diff line change
Expand Up @@ -334,30 +334,29 @@
}

.social-icons a {
font-size: 1.2rem;
padding: 8px;
margin: 15px;
font-size: 1rem;
padding: 7px;
margin: 7px 6px 0 8px;
text-decoration: none;
/* color: white; */
}

.fa-facebook{
color: hsl(203, 30%, 26%);
font-size: 1.2rem;
font-size: 1rem;
padding: 8px;
margin: 15px;
}

.fa-facebook:hover {

transform: scale(1.5);
color:#3B5998;
transition: transform 0.2s ease, color 0.2s ease;
}

.fa-instagram{
color: hsl(203, 30%, 26%);
font-size: 1.2rem;
font-size: 1rem;
padding: 8px;
margin: 15px;
}
Expand All @@ -368,18 +367,39 @@
}
.fa-x-twitter{
color: hsl(203, 30%, 26%);
font-size: 1.2rem;
font-size: 1rem;
padding: 8px;
margin: 15px;

}

.fa-x-twitter:hover {
color:black;
transform: scale(1.5);
transition: transform 0.2s ease, color 0.2s ease;
}

.fa-youtube {
color: hsl(203, 30%, 26%);
font-size: 1rem;
padding: 8px;
margin: 15px;
}

.fa-youtube:hover {
transform: scale(1.5);
color: #FF0000;
transition: transform 0.2s ease, color 0.2s ease;
}

.fa-snapchat {
color: hsl(203, 30%, 26%);
font-size: 1rem;
padding: 8px;
margin: 15px;
}
.fa-snapchat:hover {
transform: scale(1.5);
color: #FFFC00;
transition: transform 0.2s ease, color 0.2s ease;
}

.foot_panel4{
background-color: transparent;
Expand Down Expand Up @@ -432,24 +452,6 @@
background-color: rgb(196, 89, 89);
}

.social-icons a{
font-size: 1.2rem;
padding: 15px;
text-decoration: none;
color: hsl(203, 30%, 26%);
}

.fa-facebook:hover {
color:#3B5998;
}

.fa-instagram:hover {
color:#D62976;
}

.fa-twitter:hover {
color:#00B6F1;
}

.cart-section{
padding: 55px 70px 30px 70px;
Expand Down
42 changes: 28 additions & 14 deletions Css-files/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ body {
.mainhead {
text-align: center;
padding-top: 30px;
padding-bottom: 50px;
/* padding-bottom: 50px; */
}
.mainhead h1 {
font-family: Georgia;
Expand Down Expand Up @@ -367,10 +367,11 @@ div.deals:hover{
box-shadow: 2px 2px 20px black;
}
.testimonal__image{
width:100px;
height:100px;
border-radius:50%;
margin:0 auto 1.5rem;
width: 100px;
height: 100px;
border-radius: 50%;
object-fit: cover;
margin: 0 auto 1.5rem;
}
.testimonal__title{
margin-bottom: .75rem;
Expand All @@ -379,7 +380,6 @@ div.deals:hover{
margin-bottom: 1.25rem;
}


.section__title{
text-align: center;
font-size: 2rem;
Expand All @@ -390,7 +390,6 @@ div.deals:hover{
.foot-panel2{
background-color: transparent;
color:white;
height: 300px;
display: flex;
justify-content: space-evenly;
}
Expand All @@ -413,7 +412,7 @@ div.deals:hover{
.foot_panel4{
background-color: transparent;
color: white;
height: 160px;
height: auto;
font-size: 0.9rem;
text-align: center;
}
Expand Down Expand Up @@ -459,8 +458,9 @@ input
}

.social-icons a{
font-size: 1.2rem;
padding: 15px;
font-size: 1rem;
padding: 7px;
margin: 7px 6px 0 8px;
text-decoration: none;
color: brown !important;
}
Expand All @@ -476,6 +476,12 @@ input
.fa-twitter:hover {
color:#00B6F1;
}
.fa-youtube:hover {
color: #FF0000;
}
.fa-snapchat:hover {
color: #FFFC00;
}

.cart-section{
padding: 55px 70px 30px 70px;
Expand All @@ -498,9 +504,12 @@ input

.cart table,th,td{
text-align: center;
border: 2px solid black;
border: 2px solid whitesmoke;
width: 75%;
}
td{
font-size: 20px;
}

#bill{
color: rgb(196, 74, 74);
Expand Down Expand Up @@ -559,16 +568,21 @@ input

#contactForm input,
#contactForm textarea {
width: 50%;
width: 64%;
padding: 20px;
font-size: 15px;
margin: 5px;
border-radius: 10px;
border: none;
}
#contactForm input{
width: 76%;
font-size: 15px;
}

#contactForm h3 {
height: 30px;
color: #141414;
color: hsl(357, 82%,35%);
}
#contactForm textarea {
height: 100px;
Expand Down Expand Up @@ -613,4 +627,4 @@ input
border-radius: 50%;
padding: 5px 8px;
font-size: 12px;
}
}
Loading

0 comments on commit dabf53a

Please sign in to comment.