diff --git a/src/components/helpers/carousel/carousel.scss b/src/components/helpers/carousel/carousel.scss index 21d25f45..a1ec752e 100644 --- a/src/components/helpers/carousel/carousel.scss +++ b/src/components/helpers/carousel/carousel.scss @@ -1,6 +1,6 @@ .carousel { position: relative; - width: 350px; + width: 100%; margin-left: 5px; } @@ -14,6 +14,7 @@ &.is-dragging { cursor: grabbing; } + border-radius: 15px !important; } .carousel_container { @@ -45,7 +46,7 @@ .carousel_slide_inner { position: relative; overflow: hidden; - height: 190px; + height: 250px; } .carousel_button { diff --git a/src/components/helpers/sharemodal/ShareModal.jsx b/src/components/helpers/sharemodal/ShareModal.jsx index e9e26347..6b565b6c 100644 --- a/src/components/helpers/sharemodal/ShareModal.jsx +++ b/src/components/helpers/sharemodal/ShareModal.jsx @@ -25,7 +25,7 @@ function ShareModal({ modalClose, data }) { return (
- {variables.getMessage('widgets.quote.share')} +

{variables.getMessage('widgets.quote.share')}

diff --git a/src/components/modals/main/marketplace/Item.jsx b/src/components/modals/main/marketplace/Item.jsx index 9255e7fe..384c43b5 100644 --- a/src/components/modals/main/marketplace/Item.jsx +++ b/src/components/modals/main/marketplace/Item.jsx @@ -53,9 +53,9 @@ export default class Item extends PureComponent { } } - incrementCount() { - if (this.state.count !== this.props.data.data.quotes.length) { - this.setState({ count: this.props.data.data.quotes.length }); + incrementCount(type) { + if (this.state.count !== this.props.data.data[type].length) { + this.setState({ count: this.props.data.data[type].length }); } else { this.setState({ count: 5 }); } @@ -83,15 +83,6 @@ export default class Item extends PureComponent { ); } - let type; - if (this.props.data.data.type === 'settings') { - type = 'Settings Pack'; - } else if (this.props.data.data.type === 'quotes') { - type = 'Quote Pack'; - } else if (this.props.data.data.type === 'photos') { - type = 'Photos Pack'; - } - return (
) : null} + {this.props.data.data.settings ? ( + product this.setState({ showLightbox: true })} + /> + ) : null} {this.props.data.data.quotes ? ( <> @@ -139,7 +138,7 @@ export default class Item extends PureComponent { ))}
- this.incrementCount()}> + this.incrementCount('quotes')}> {this.state.count !== this.props.data.data.quotes.length ? ( <> {' '} @@ -156,17 +155,42 @@ export default class Item extends PureComponent { ) : null} {this.props.data.data.settings ? ( - product this.setState({ showLightbox: true })} - /> + <> + + + + + + {Object.entries(this.props.data.data.settings).slice(0, this.state.count).map(([key, value]) => ( + + + + + ))} +
{variables.getMessage('modals.main.marketplace.product.setting')}{variables.getMessage('modals.main.marketplace.product.value')}
{key}{value}
+
+ this.incrementCount('settings')}> + {this.state.count !== this.props.data.data.settings.length ? ( + <> + {' '} + {variables.getMessage('modals.main.marketplace.product.show_all')} + + ) : ( + <> + {' '} + {variables.getMessage('modals.main.marketplace.product.show_less')} + + )} + +
+ ) : null} - - {variables.getMessage('modals.main.marketplace.product.description')} - - +
+

+ {variables.getMessage('modals.main.marketplace.product.description')} +

+

+

@@ -242,45 +266,48 @@ export default class Item extends PureComponent {
-
- icon - {this.props.button} -
- - - - - + + - - - -
- {this.props.data.data.collection ? ( -
- - {variables.getMessage('modals.main.marketplace.product.part_of')} - - {this.props.data.data.collection} - + +
- ) : null} + {this.props.data.data.collection ? ( +
+ + {variables.getMessage('modals.main.marketplace.product.part_of')} + + {this.props.data.data.collection} + +
+ ) : null} +
diff --git a/src/components/modals/main/marketplace/Items.jsx b/src/components/modals/main/marketplace/Items.jsx index cf58ecce..80e43796 100644 --- a/src/components/modals/main/marketplace/Items.jsx +++ b/src/components/modals/main/marketplace/Items.jsx @@ -22,7 +22,7 @@ function Items({ collection.news ? { backgroundColor: collection.background_colour } : { - backgroundImage: `linear-gradient(to right, rgba(0 ,0, 0, 0.9), rgba(0 ,0, 0, 0.7), transparent, rgba(0 ,0, 0, 0.7), rgba(0 ,0, 0, 0.9)), url('${collection.img}')`, + backgroundImage: `linear-gradient(to right, rgba(0, 0, 0, 0.9), rgba(0, 0, 0, 0.7), transparent, rgba(0, 0, 0, 0.7), rgba(0 ,0, 0, 0.9)), url('${collection.img}')`, } } > diff --git a/src/components/modals/main/marketplace/sections/Marketplace.jsx b/src/components/modals/main/marketplace/sections/Marketplace.jsx index cf76c821..8b30da9d 100644 --- a/src/components/modals/main/marketplace/sections/Marketplace.jsx +++ b/src/components/modals/main/marketplace/sections/Marketplace.jsx @@ -339,7 +339,7 @@ export default class Marketplace extends PureComponent {
diff --git a/src/components/modals/main/scss/marketplace/_main.scss b/src/components/modals/main/scss/marketplace/_main.scss index bc9af2ef..836e2635 100644 --- a/src/components/modals/main/scss/marketplace/_main.scss +++ b/src/components/modals/main/scss/marketplace/_main.scss @@ -108,8 +108,9 @@ .itemShowcase { display: flex; flex-flow: column; - gap: 15px; - width: 50%; + gap: 25px; + width: 60%; + max-width: 650px; .description { max-lines: 3; @@ -120,24 +121,47 @@ width: 100%; height: auto; } + + table { + table-layout: fixed; + width: 100%; + max-width: 650px !important; + word-wrap: break-word !important; + } } .itemInfo { - display: flex; - flex-flow: column; - gap: 15px; - width: 170px; - box-sizing: border-box !important; + background-position: center; + background-repeat: no-repeat; + background-size: cover; + border-radius: 15px; + width: 25%; + max-height: 450px; + + .front { + padding: 20px; + height: 100%; + display: flex; + flex-flow: column; + gap: 15px; + width: 100%; + box-sizing: border-box !important; + border-radius: 12px 12px 0 0; + backdrop-filter: blur(40px) saturate(150%) brightness(75%); + -webkit-backdrop-filter: blur(40px) saturate(150%) brightness(75%); + @include themed() { + background-image: linear-gradient(to bottom, transparent, t($modal-background)); + } + } - img { + + .icon { width: 100%; height: auto; border-radius: 12px; - - @include themed() { - box-shadow: 0 0 0 3px t($modal-sidebarActive); - } + box-shadow: 0 5px 25px black; } + .divider { text-transform: uppercase; diff --git a/src/components/modals/main/scss/marketplace/modules/_item.scss b/src/components/modals/main/scss/marketplace/modules/_item.scss index 01d3fd7b..a34dd50e 100644 --- a/src/components/modals/main/scss/marketplace/modules/_item.scss +++ b/src/components/modals/main/scss/marketplace/modules/_item.scss @@ -18,7 +18,7 @@ p.description { justify-content: space-between; flex-wrap: wrap; width: calc(100% - 30px); - gap: 15px; + gap: 25px; .items { margin-top: 0 !important; diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json index cc694c34..70e1d483 100644 --- a/src/translations/de_DE.json +++ b/src/translations/de_DE.json @@ -530,7 +530,9 @@ "update_addon": "Update Add-on", "back": "Back", "report": "Report" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "Sieht aus, als ob Sie offline sind", diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index 81f8de2c..6812299f 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -524,7 +524,9 @@ "update_addon": "Update Add-on", "back": "Back", "report": "Report" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "Looks like you're offline", diff --git a/src/translations/en_US.json b/src/translations/en_US.json index 95be92e5..ef071697 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -529,7 +529,9 @@ "update_addon": "Update Add-on", "back": "Back", "report": "Report" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "Looks like you're offline", diff --git a/src/translations/es.json b/src/translations/es.json index 8cf4115c..438d31ea 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -529,7 +529,9 @@ "update_addon": "Actualizar complemento", "back": "Back", "report": "Report" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "Parece que estás desconectado", diff --git a/src/translations/es_419.json b/src/translations/es_419.json index 2df6d961..6602bb31 100644 --- a/src/translations/es_419.json +++ b/src/translations/es_419.json @@ -547,6 +547,8 @@ "back": "Back", "report": "Report" }, + "setting": "Setting", + "value": "Value", "quote_warning": { "title": "Advertencia", "description": "¡Este paquete de citaciones solicita a servidores externos que pueden rastrearte!" diff --git a/src/translations/fr.json b/src/translations/fr.json index 2f819db0..958c5687 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -529,7 +529,9 @@ "update_addon": "Update Add-on", "back": "Back", "report": "Report" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "Hors ligne", diff --git a/src/translations/id_ID.json b/src/translations/id_ID.json index bc9104c0..2e602c5c 100644 --- a/src/translations/id_ID.json +++ b/src/translations/id_ID.json @@ -529,7 +529,9 @@ "update_addon": "Perbarui Add-on", "back": "Back", "report": "Report" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "Sepertinya Anda sedang dalam mode luring", diff --git a/src/translations/nl.json b/src/translations/nl.json index 29e9f8df..d8e12065 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -529,7 +529,9 @@ "update_addon": "Update Add-on", "back": "Back", "report": "Report" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "Het lijkt er op dat je niet verbonden bent het internet", diff --git a/src/translations/no.json b/src/translations/no.json index b1146a88..c6d473db 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -529,7 +529,9 @@ "update_addon": "Update Add-on", "back": "Back", "report": "Report" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "Ser ut som at du er offiline", diff --git a/src/translations/ru.json b/src/translations/ru.json index 32e5d608..3f5b14d4 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -529,7 +529,9 @@ "update_addon": "Update Add-on", "back": "Back", "report": "Report" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "Похоже, что вы офлайн", diff --git a/src/translations/tr_TR.json b/src/translations/tr_TR.json index e29b91ad..e87bfd43 100644 --- a/src/translations/tr_TR.json +++ b/src/translations/tr_TR.json @@ -524,7 +524,9 @@ "update_addon": "Eklentiyi Güncelle", "back": "Geri", "report": "Bildir/Raporla" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "Çevrimdışı görünüyorsun.", diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json index ed5e96f2..d5d9395a 100644 --- a/src/translations/zh_CN.json +++ b/src/translations/zh_CN.json @@ -529,7 +529,9 @@ "update_addon": "Update Add-on", "back": "Back", "report": "Report" - } + }, + "setting": "Setting", + "value": "Value" }, "offline": { "title": "您目前似乎离线",