diff --git a/src/components/modals/main/Main.jsx b/src/components/modals/main/Main.jsx index c8c3edd1..37032e13 100644 --- a/src/components/modals/main/Main.jsx +++ b/src/components/modals/main/Main.jsx @@ -56,7 +56,7 @@ export default function MainModal({ modalClose }) { return (
diff --git a/src/components/modals/main/marketplace/Item.jsx b/src/components/modals/main/marketplace/Item.jsx index 8e6f3b83..1b895ba4 100644 --- a/src/components/modals/main/marketplace/Item.jsx +++ b/src/components/modals/main/marketplace/Item.jsx @@ -13,6 +13,7 @@ import { MdTranslate, MdOutlineKeyboardArrowRight, MdExpandMore, + MdExpandLess, MdStyle, } from 'react-icons/md'; import Modal from 'react-modal'; @@ -53,7 +54,11 @@ export default class Item extends PureComponent { } incrementCount() { - this.setState({ count: this.props.data.data.quotes.length }); + if (this.state.count !== this.props.data.data.quotes.length) { + this.setState({ count: this.props.data.data.quotes.length }); + } else { + this.setState({ count: 5 }); + } } render() { @@ -123,8 +128,8 @@ export default class Item extends PureComponent { <> - - + + {this.props.data.data.quotes.slice(0, this.state.count).map((quote, index) => ( @@ -135,7 +140,15 @@ export default class Item extends PureComponent {
QuoteAuthor{variables.getMessage('modals.main.settings.sections.quote.title')}{variables.getMessage('modals.main.settings.sections.quote.author')}
this.incrementCount()}> - Show All + {this.state.count !== this.props.data.data.quotes.length ? ( + <> + {variables.getMessage('modals.main.marketplace.product.show_all')} + + ) : ( + <> + {variables.getMessage('modals.main.marketplace.product.show_less')} + + )}
@@ -213,7 +226,10 @@ export default class Item extends PureComponent {
- {variables.getMessage('modals.main.settings.sections.background.type.title')} + + {' '} + {variables.getMessage('modals.main.settings.sections.background.type.title')} + {' '} {variables.getMessage( diff --git a/src/components/modals/main/marketplace/sections/Added.jsx b/src/components/modals/main/marketplace/sections/Added.jsx index 9fc43491..6d92cb8f 100644 --- a/src/components/modals/main/marketplace/sections/Added.jsx +++ b/src/components/modals/main/marketplace/sections/Added.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { MdUpdate, MdOutlineExtensionOff } from 'react-icons/md'; +import { MdUpdate, MdOutlineExtensionOff, MdCode } from 'react-icons/md'; import { toast } from 'react-toastify'; import Modal from 'react-modal'; @@ -193,10 +193,16 @@ export default class Added extends PureComponent { if (this.state.installed.length === 0) { return ( <> +
+ {variables.getMessage('modals.main.navbar.addons')} +
+
{sideLoadBackendElements()} - +
@@ -224,12 +230,19 @@ export default class Added extends PureComponent { return ( <> - {sideLoadBackendElements()} {variables.getMessage('modals.main.addons.added')} -
+ {sideLoadBackendElements()} +
+ + +
{variables.getMessage('modals.main.addons.sort.a_z')} -
- {item.name} + {item.name}
{item.name}
diff --git a/src/components/modals/main/tabs/backend/Tabs.jsx b/src/components/modals/main/tabs/backend/Tabs.jsx index 30a380c8..8a4fc06d 100644 --- a/src/components/modals/main/tabs/backend/Tabs.jsx +++ b/src/components/modals/main/tabs/backend/Tabs.jsx @@ -58,7 +58,7 @@ export default class Tabs extends PureComponent { } return ( -
+
    {this.props.children.map((tab, index) => ( - {item.name} - {item.name} + className="quickLinksMetro" + key={item.key} + href={item.url} + target={target} + rel={rel} + draggable={false} + > + {item.name} + {item.name} ); } const link = ( - + {item.name} ); diff --git a/src/scss/index.scss b/src/scss/index.scss index 18331e46..bdc6a805 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -81,6 +81,7 @@ body { .frame { width: 100%; + height: 100%; } /* fonts (imported from fontsource) */ diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json index 053f5869..6c97d7bd 100644 --- a/src/translations/de_DE.json +++ b/src/translations/de_DE.json @@ -489,6 +489,7 @@ "description": "Description", "show_more": "Show More", "show_less": "Show Less", + "show_all": "Show All", "showing": "Showing", "no_images": "No. Images", "no_quotes": "No. Quotes", diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index 7d788967..5ac4b404 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -487,6 +487,7 @@ "description": "Description", "show_more": "Show More", "show_less": "Show Less", + "show_all": "Show All", "showing": "Showing", "no_images": "No. Images", "no_quotes": "No. Quotes", diff --git a/src/translations/en_US.json b/src/translations/en_US.json index 3f7b6e19..d19d8bc5 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -488,6 +488,7 @@ "description": "Description", "show_more": "Show More", "show_less": "Show Less", + "show_all": "Show All", "showing": "Showing", "no_images": "No. Images", "no_quotes": "No. Quotes", diff --git a/src/translations/es.json b/src/translations/es.json index 5e955ed4..99ae0d84 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -488,6 +488,7 @@ "description": "Description", "show_more": "Show More", "show_less": "Show Less", + "show_all": "Show All", "showing": "Showing", "no_images": "No. Images", "no_quotes": "No. Quotes", diff --git a/src/translations/fr.json b/src/translations/fr.json index 9197e437..3c330b57 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -488,6 +488,7 @@ "description": "Description", "show_more": "Show More", "show_less": "Show Less", + "show_all": "Show All", "showing": "Showing", "no_images": "No. Images", "no_quotes": "No. Quotes", diff --git a/src/translations/id_ID.json b/src/translations/id_ID.json index dd213251..9aa70783 100644 --- a/src/translations/id_ID.json +++ b/src/translations/id_ID.json @@ -488,6 +488,7 @@ "description": "Description", "show_more": "Show More", "show_less": "Show Less", + "show_all": "Show All", "showing": "Showing", "no_images": "No. Images", "no_quotes": "No. Quotes", diff --git a/src/translations/nl.json b/src/translations/nl.json index 3c35f58d..2c7f04a0 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -488,6 +488,7 @@ "description": "Description", "show_more": "Show More", "show_less": "Show Less", + "show_all": "Show All", "showing": "Showing", "no_images": "No. Images", "no_quotes": "No. Quotes", diff --git a/src/translations/no.json b/src/translations/no.json index e4af5d95..3c706838 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -488,6 +488,7 @@ "description": "Description", "show_more": "Show More", "show_less": "Show Less", + "show_all": "Show All", "showing": "Showing", "no_images": "No. Images", "no_quotes": "No. Quotes", diff --git a/src/translations/ru.json b/src/translations/ru.json index d5ba401e..5ae1c0e1 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -488,6 +488,7 @@ "description": "Description", "show_more": "Show More", "show_less": "Show Less", + "show_all": "Show All", "showing": "Showing", "no_images": "No. Images", "no_quotes": "No. Quotes", diff --git a/src/translations/tr_TR.json b/src/translations/tr_TR.json index ecfe3e13..9932bb07 100644 --- a/src/translations/tr_TR.json +++ b/src/translations/tr_TR.json @@ -488,6 +488,7 @@ "description": "Açıklama/Tanım", "show_more": "Daha fazla göster", "show_less": "Daha az göster", + "show_all": "Show All", "showing": "Showing", "no_images": "Fotoğraf bulunamadı", "no_quotes": "Alıntı bulunamadı", diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json index badd26a4..4127905c 100644 --- a/src/translations/zh_CN.json +++ b/src/translations/zh_CN.json @@ -488,6 +488,7 @@ "description": "Description", "show_more": "Show More", "show_less": "Show Less", + "show_all": "Show All", "showing": "Showing", "no_images": "No. Images", "no_quotes": "No. Quotes",