diff --git a/README.md b/README.md index 5f4b8c41..be0618e2 100644 --- a/README.md +++ b/README.md @@ -92,4 +92,4 @@ Many thanks to the photographers [here](https://api.muetab.com/images/photograph And finally, a big thank you to all the other [contributors](https://github.com/mue/mue/graphs/contributors)! ### Resources [Pexels](https://pexels.com), [Unsplash](https://unsplash.com) - Stock photos used for offline mode
-[Undraw](https://undraw.co) - Welcome modal images
+[Undraw](https://undraw.co) - Welcome modal images diff --git a/src/components/modals/main/scss/index.scss b/src/components/modals/main/scss/index.scss index 8853a52d..d4238de5 100644 --- a/src/components/modals/main/scss/index.scss +++ b/src/components/modals/main/scss/index.scss @@ -348,6 +348,7 @@ li { min-height: 300px !important; max-width: 300px !important; margin: auto; + font-size: 1rem; h4 { cursor: initial; diff --git a/src/components/modals/main/scss/marketplace/_buttons.scss b/src/components/modals/main/scss/marketplace/_buttons.scss index 6903ba39..d91f5ae5 100644 --- a/src/components/modals/main/scss/marketplace/_buttons.scss +++ b/src/components/modals/main/scss/marketplace/_buttons.scss @@ -47,6 +47,7 @@ .sideload { display: inline; margin-top: 0px; + float: none !important; } button.round { diff --git a/src/components/modals/main/scss/marketplace/_main.scss b/src/components/modals/main/scss/marketplace/_main.scss index ea7cd20e..4ba9dc7d 100644 --- a/src/components/modals/main/scss/marketplace/_main.scss +++ b/src/components/modals/main/scss/marketplace/_main.scss @@ -138,6 +138,10 @@ p.description { position: absolute; width: 300px; + h1 { + font-size: 2rem; + } + svg { font-size: 50px; margin-bottom: -20px; @@ -212,6 +216,7 @@ p.description { h1 { margin-top: -20px; + font-size: 2rem; } } diff --git a/src/components/modals/main/scss/settings/_main.scss b/src/components/modals/main/scss/settings/_main.scss index 2c42d142..cc949396 100644 --- a/src/components/modals/main/scss/settings/_main.scss +++ b/src/components/modals/main/scss/settings/_main.scss @@ -154,7 +154,7 @@ legend { border-radius: 0.7em; h1 { - font-size: 1em; + font-size: 1rem; } } @@ -198,6 +198,7 @@ legend { .changelogtab { h1 { max-width: 85%; + font-size: 2rem; } img { diff --git a/src/components/modals/main/settings/sections/About.jsx b/src/components/modals/main/settings/sections/About.jsx index 8caea496..d2cf62ef 100644 --- a/src/components/modals/main/settings/sections/About.jsx +++ b/src/components/modals/main/settings/sections/About.jsx @@ -91,7 +91,7 @@ export default class About extends React.PureComponent { Logo

{this.language.copyright} {window.constants.COPYRIGHT_YEAR}-{new Date().getFullYear()} {window.constants.COPYRIGHT_NAME} ({window.constants.COPYRIGHT_LICENSE})

{this.language.version.title} {window.constants.VERSION} ({this.state.update})

- {window.language.modals.welcome.sections.privacy.links.privacy_policy} + {window.language.modals.welcome.sections.privacy.links.privacy_policy}

{this.language.contact_us}

diff --git a/src/components/modals/welcome/WelcomeSections.jsx b/src/components/modals/welcome/WelcomeSections.jsx index 06a851dc..9b67e9da 100644 --- a/src/components/modals/welcome/WelcomeSections.jsx +++ b/src/components/modals/welcome/WelcomeSections.jsx @@ -195,8 +195,8 @@ export default class WelcomeSections extends React.PureComponent {

{language.sections.final.changes}

{language.sections.final.changes_description}

-
this.props.switchTab(1)}>{languageSettings.title}: {languages.find((i) => i.value === localStorage.getItem('language')).name}
-
this.props.switchTab(3)}>{appearance.theme.title}: {this.getSetting('theme')}
+
this.props.switchTab(1)}>{languageSettings.title}: {languages.find((i) => i.value === localStorage.getItem('language')).name}
+
this.props.switchTab(3)}>{appearance.theme.title}: {this.getSetting('theme')}
{(this.state.importedSettings.length !== 0) ?
this.props.switchTab(2)}>{language.sections.final.imported} {this.state.importedSettings.length} {language.sections.final.settings}
: null}
diff --git a/src/components/modals/welcome/welcome.scss b/src/components/modals/welcome/welcome.scss index 23aa7d7e..391968f7 100644 --- a/src/components/modals/welcome/welcome.scss +++ b/src/components/modals/welcome/welcome.scss @@ -23,7 +23,6 @@ display: flex; justify-content: center; align-items: center; - } section:nth-child(2) { @@ -40,7 +39,7 @@ } h1 { - font-size: 2.5em; + font-size: 2.5rem; } h3.quicktip { @@ -95,6 +94,10 @@ background: var(--tab-active); cursor: pointer; } + + span { + font-size: 1rem; + } } .auto { @@ -123,6 +126,7 @@ a.privacy { text-decoration: none; color: var(--modal-text); + font-size: 1rem; &:hover { color: #5352ed; diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index 0b2fe7ee..ba1af76d 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -392,7 +392,7 @@ "sections": { "intro": { "title": "Welcome to Mue Tab", - "description": "Thank you for installing, we hope you enjoy your time with out extension." + "description": "Thank you for installing, we hope you enjoy your time with our extension." }, "language": { "title": "Choose your language", diff --git a/src/translations/en_US.json b/src/translations/en_US.json index 9254a80b..ae8479d4 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -392,7 +392,7 @@ "sections": { "intro": { "title": "Welcome to Mue Tab", - "description": "Thank you for installing, we hope you enjoy your time with out extension." + "description": "Thank you for installing, we hope you enjoy your time with our extension." }, "language": { "title": "Choose your language", diff --git a/src/translations/nl.json b/src/translations/nl.json index f3add711..12185cdd 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -392,7 +392,7 @@ "sections": { "intro": { "title": "Welcome to Mue Tab", - "description": "Thank you for installing, we hope you enjoy your time with out extension." + "description": "Thank you for installing, we hope you enjoy your time with our extension." }, "language": { "title": "Choose your language", diff --git a/src/translations/no.json b/src/translations/no.json index 2cc989e8..21ca61af 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -392,7 +392,7 @@ "sections": { "intro": { "title": "Welcome to Mue Tab", - "description": "Thank you for installing, we hope you enjoy your time with out extension." + "description": "Thank you for installing, we hope you enjoy your time with our extension." }, "language": { "title": "Choose your language", diff --git a/src/translations/ru.json b/src/translations/ru.json index e3d0003c..2a1ee49c 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -393,7 +393,7 @@ "sections": { "intro": { "title": "Welcome to Mue Tab", - "description": "Thank you for installing, we hope you enjoy your time with out extension." + "description": "Thank you for installing, we hope you enjoy your time with our extension." }, "language": { "title": "Choose your language",