Skip to content

Commit

Permalink
Merge pull request #4653 from Riyachauhan11/main
Browse files Browse the repository at this point in the history
improving edit address and recent activity pages
  • Loading branch information
abhi03ruchi authored Nov 5, 2024
2 parents 25d88f6 + a1761d3 commit 133bd93
Show file tree
Hide file tree
Showing 4 changed files with 423 additions and 346 deletions.
259 changes: 104 additions & 155 deletions activity.css
Original file line number Diff line number Diff line change
@@ -1,207 +1,156 @@
body {
font-family: Arial, sans-serif;
margin: 0;
padding: 0;
background-color: #f57d7d;
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");
background-size: cover;

/* Basic Reset */
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}

.circle {
height: 24px;
width: 24px;
border-radius: 50%;
background-color: black;
position: fixed;
top: 0;
left: 0;
pointer-events: none;
z-index: 99999999;
transition: transform 0.1s ease-out;
body {
font-family: "Poppins", sans-serif;
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");
background-attachment: fixed;
background-size: cover;
color: #333;
}

header {
background-color: #333;
background-color: #f57d7d;
padding: 1em;
text-align: center;
height: 20px;
padding: 1em 0;
display: flex;
justify-content: space-between;
align-items: center;
}


.fa-home {
position: absolute;
left: 5%;
top: 15px;
font-size: 25px;
header nav a {
color: #fff;
text-decoration: none;
font-size: 25px;
transition: color 0.3s;
}

.fa-home:hover {
color: #534141;
header nav a:hover {
color: #534141;
}

.fa-arrow-left{
position: absolute;
right: 5%;
top: 10px;
font-size: 25px;
}
.fa-arrow-left:hover {
color: #534141;
.fa-home,
.fa-arrow-left {
color: #333; /* Original color */
padding: 0 15px;
}

header nav a {
color: #fff;
text-decoration: none;
/* Revert to the original color on hover */
.fa-home:hover {
color: #e73c3c;
}

.active {
background-color: #555;
padding: 10px;
border-radius: 10px;
.fa-arrow-left:hover {
color: #e73c3c;
}

main {
display: flex;
flex-direction: column;
align-items: center;
padding: 2em;
display: flex;
flex-direction: column;
align-items: center;
padding: 2em 0;
color: #534141;
}

h1 {
font-size: 2em;
color: #534141;
margin-bottom: 1em;
}

.activity-feed {
background-color: #f1aeae;
padding: 1em;
margin-bottom: 20px;
border: 1px solid #ddd;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
width: 80%;
background-color: #ffe5e5;
padding: 1.5em;
border-radius: 10px;
box-shadow: 0 0 15px rgba(0, 0, 0, 0.1);
width: 80%;
max-width: 600px;
}

.activity-feed ul {
list-style: none;
margin: 0;
padding: 0;
list-style: none;
}

.activity-feed li {
margin-bottom: 10px;
padding-bottom: 10px;
border-bottom: 1px solid #ccc;
transition: background-color 0.3s ease-in-out;
}


.activity-feed li:last-child {
border-bottom: none;
display: flex;
align-items: center;
margin-bottom: 1em;
padding: 1em;
background-color: #f8dcdc;
border-radius: 8px;
transition: transform 0.2s, box-shadow 0.2s;
}

.activity-feed li:hover {
background-color: #f7dada;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
cursor: pointer;
transform: translateY(-5px);
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
}

.activity-feed i {
margin-right: 10px;
/* color: #666; */
color: #514f4f;
font-size: 1.5em;
margin-right: 15px;
color: #514f4f;
}

.activity-feed p {
font-size: 16px;
color: #333;
padding: 10px;
font-size: 1em;
color: #333;
}

.fa-shopping-cart, .fa-truck, .fa-check {
color: #2ecc71;
.fa-shopping-cart,
.fa-truck,
.fa-check {
color: #e74c3c;
}

.fa-envelope {
color: #3498db;
color: #3498db;
}

.fa-book, .fa-exchange {
color: #f1c40f;
.fa-book,
.fa-exchange {
color: #f1c40f;
}

footer {
background-color: #333;
color: #fff;
padding: 1em;
text-align: center;
clear: both;
}

.details {
background-color: #f4d0d0;
padding: 1em;
border: 1px solid #ddd;
margin-top: 10px;
background-color: #333;
color: #fff;
padding: 1em;
text-align: center;
margin-top: 2em;
}

.details h3 {
margin-top: 0;
}

.details p {
font-size: 14px;
color: #666;
}

#detail-container {
width: 500px;
max-width: 90%;
}

#detail-container h3 {
margin-top: 0;
}

#detail-container p {
font-size: 14px;
color: #666;
}



.detail {
background-color: #f5d5d5;
padding: 10px;
border: 1px solid #ddd;
margin-top: 10px;
}

.detail h3 {
margin-top: 0;
}

.detail p {
font-size: 14px;
color: #666;
}

/* Responsive design */

/* Circle Decorations */
.circle {
position: fixed;
border-radius: 50%;
background-color: black;
height: 24px;
width: 24px;
top: 0;
left: 0;
pointer-events: none;
z-index: 9999;
transition: transform 0.1s ease-out;
}

/* Responsive Design */
@media only screen and (max-width: 768px) {
main {
padding: 1em;
}
.activity-feed {
width: 90%;
}
main {
padding: 1em;
}
.activity-feed {
width: 90%;
}
}

@media only screen and (max-width: 480px) {
header nav ul {
flex-direction: column;
}
header nav ul li {
margin-right: 0;
margin-bottom: 10px;
}
.activity-feed {
width: 100%;
}
}
header nav a {
font-size: 20px;
}
.activity-feed {
width: 100%;
}
}
Loading

0 comments on commit 133bd93

Please sign in to comment.