Merge conflicts remote-tracking branch 'origin/main' into ui

This commit is contained in:
2025-03-27 16:16:31 +05:30
37 changed files with 1640 additions and 758 deletions

View File

@@ -8,17 +8,17 @@
background-color: var(--background-color-secondary);
position: absolute;
left: 0;
padding: 95px 8px;
padding: 100px 50px;
padding-bottom: 32px;
backdrop-filter: blur(6px);
.marketplace-container {
position: relative;
padding: 20px 2px;
// height: calc(100vh - 120px);
height: 100%;
background-color: var(--background-color);
box-shadow: #{$box-shadow-medium};
border-radius: #{$border-radius-extra-large};
position: relative;
}
.marketPlace {
@@ -37,47 +37,34 @@
width: 100%;
display: flex;
align-items: center;
gap: 20px;
gap: 12px;
.asset-search-wrapper {
.search-wrapper {
min-width: 60%;
max-width: 684px;
padding: 0;
border-radius: $border-radius-large;
.search-wrapper {
padding: 0 12px;
.search-container {
display: flex;
align-items: center;
width: 100%;
border: none !important;
border-radius: $border-radius-large;
overflow: hidden;
padding: 6px 12px;
outline: 1px solid var(--border-color);
input {
border: none !important;
outline: none;
}
.search-container {
border: none !important;
box-shadow: $box-shadow-medium;
border-radius: $border-radius-large;
input {
border: none !important;
outline: none;
}
}
}
.regularDropdown-container {
max-width: 159px;
max-height: 30px;
height: 100%;
.dropdown-header {
align-items: center;
}
}
.button {
padding: 5px 20px;
border: 1px solid var(--accent-color);
border-radius: 14px;
color: var(--accent-color);
}
.rating-container {
@@ -102,7 +89,6 @@
color: var(--text-color);
font-weight: $medium-weight;
font-size: $xlarge;
margin: 10px 0;
}
.cards-wrapper-container {
@@ -131,7 +117,6 @@
border-radius: 10px;
padding: 5px;
background-color: var(--accent-color);
cursor: pointer;
}
.image-container {