Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/cards redesign #1593

Merged
merged 24 commits into from
Apr 27, 2023
Merged
Changes from 10 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 158 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -7,5 +7,7 @@
"type": "git",
"url": "git+https://github.com/decentraland/marketplace.git"
},
"dependencies": {}
"dependencies": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this shouldn't be here, it needs to be updated in the webapp/package.json.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same goes for the -lock file from above.

"@dcl/schemas": "^6.17.0"
}
}
14 changes: 7 additions & 7 deletions webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webapp/package.json
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
"version": "0.0.0-development",
"dependencies": {
"@dcl/crypto": "^3.0.0",
"@dcl/schemas": "^6.14.1",
"@dcl/schemas": "^6.17.0",
"@dcl/ui-env": "^1.2.0",
"@ethersproject/providers": "^5.6.2",
"classnames": "^2.3.1",
99 changes: 90 additions & 9 deletions webapp/src/components/AssetCard/AssetCard.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,48 @@
.AssetCard {
overflow: hidden;
height: 346px;
overflow: visible;
}

.ui.cards a.card.AssetCard:hover,
.ui.link.card.AssetCard:hover,
.ui.link.cards .card.AssetCard:hover,
a.ui.card.AssetCard:hover,
.ui.cards > .ui.card.AssetCard.link:hover,
.ui.card.AssetCard.link:hover {
border: none !important;
}

.ui.card.AssetCard > .content,
.ui.cards > .card.AssetCard > .content {
height: 185px;
transition: height 0.3s !important;
}

.ui.card.AssetCard > .content > .header:not(.ui),
.ui.cards > .card.AssetCard > .content > .header:not(.ui) {
flex: unset;
}

.ui.card.AssetCard:hover > .content,
.ui.cards > .card.AssetCard:hover > .content {
position: absolute;
margin-top: 161px;
width: 100%;
height: 222px;
background-color: var(--card);
box-shadow: 0px 4px 34px 0px rgba(255, 255, 255, 0.37) !important;
border-radius: 0px 0px 10px 10px !important;
}

.ui.card.AssetCard:hover .AssetImage,
.ui.cards > .card.AssetCard:hover .AssetImage {
box-shadow: 0px 4px 34px 0px rgba(255, 255, 255, 0.37) !important;
border-radius: 10px !important;
}

.ui.card.AssetCard .AssetImage,
.ui.card.AssetCard .AssetImage .rarity-background {
border-radius: 10px 10px 0px 0px !important;
}

.AssetCard .header,
@@ -9,22 +52,54 @@
letter-spacing: -0.2px;
}

.AssetCard .extraInformation {
visibility: hidden;
height: 0px;
}

.AssetCard:hover .extraInformation {
visibility: visible;
}

.AssetCard .ui.header.small {
font-size: 14.5px;
font-weight: 400;
}

.AssetCard .CatalogItemInformation {
color: white;
display: flex;
flex-direction: column;
font-size: 14px;
transition: inherit;
flex: 1;
}

.AssetCard:hover .CatalogItemInformation {
margin-top: 13px;
}

.AssetCard .header .title {
flex: 1 2 auto;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
margin-right: 20px;
margin-bottom: 0px;
display: flex;
flex-direction: column;
}

.ui.card.AssetCard > .content {
flex: none;
.AssetCard .Creator {
font-size: 14px;
font-weight: 400;
color: var(--secondary-text);
}

.ui.card.AssetCard > .content > .header:not(.ui),
.ui.cards > .card.AssetCard > .content > .header:not(.ui) {
display: flex;
margin-bottom: 6px;
margin-bottom: 0px;
}

.AssetCard .dcl.mana.inline {
@@ -46,10 +121,6 @@ a.ui.card.link:hover .meta {
margin-top: 12px;
}

.AssetCard .AssetImage {
overflow: hidden;
}

.AssetCard .AssetImage .ens-subdomain {
background-size: 557px;
background-position-y: -133px;
@@ -79,7 +150,7 @@ a.ui.card.link:hover .meta {
align-self: flex-end;
background-color: #ecebed;
border: 1px solid #a09ba8;
color: #43404A;
color: #43404a;
font-size: 11px;
border-radius: 50px !important;
display: flex;
@@ -92,6 +163,16 @@ a.ui.card.link:hover .meta {
z-index: 2;
}

.AssetCard .AssetImage {
height: 161px;
}

.AssetCard .PriceInMana .ui.header.large {
font-size: 30px;
font-weight: 600;
margin: 0px;
}

@media (max-width: 1199px) {
.AssetCard .LandBubble {
align-self: center;
Loading