diff --git a/src/components/modals/main/scss/index.scss b/src/components/modals/main/scss/index.scss index 690b7f82..28eb8413 100644 --- a/src/components/modals/main/scss/index.scss +++ b/src/components/modals/main/scss/index.scss @@ -170,6 +170,12 @@ h5 { gap: 20px; justify-content: center; align-items: center; + .link { + display: flex; + flex-flow: row; + gap: 15px; + align-items: center; + } } .marketplaceCondition { diff --git a/src/components/modals/main/scss/modules/_sidebar.scss b/src/components/modals/main/scss/modules/_sidebar.scss index 32beb5fe..2b5cce2e 100644 --- a/src/components/modals/main/scss/modules/_sidebar.scss +++ b/src/components/modals/main/scss/modules/_sidebar.scss @@ -6,7 +6,7 @@ left: 0; position: sticky; margin: 0; - padding: 0; + padding: 0 5px 0 5px; background: t($modal-sidebar); border-radius: 12px 0 0 12px; overflow-y: auto; @@ -73,3 +73,8 @@ } } } + +.css-j204z7-MuiFormControlLabel-root { + margin-left: 0 !important; + margin-right: 0 !important; +} diff --git a/src/components/modals/main/settings/Header.jsx b/src/components/modals/main/settings/Header.jsx index cfb088d6..5a39fb51 100644 --- a/src/components/modals/main/settings/Header.jsx +++ b/src/components/modals/main/settings/Header.jsx @@ -63,17 +63,6 @@ class Header extends PureComponent { )} {this.props.title}
- {this.props.switch && ( )} +
{this.props.zoomSetting && ( diff --git a/src/components/modals/main/settings/sections/Language.jsx b/src/components/modals/main/settings/sections/Language.jsx index e09b7e32..d215edca 100644 --- a/src/components/modals/main/settings/sections/Language.jsx +++ b/src/components/modals/main/settings/sections/Language.jsx @@ -1,6 +1,8 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; +import { MdOutlineOpenInNew } from 'react-icons/md'; + import Radio from '../Radio'; import languages from 'modules/languages.json'; @@ -67,9 +69,26 @@ export default class LanguageSettings extends PureComponent { render() { return ( <> - - {variables.getMessage('modals.main.settings.sections.language.title')} - +
+ + {variables.getMessage('modals.main.settings.sections.language.title')} + +
+ {/* + Improve + + */} + + Add translation + + +
+
diff --git a/src/components/modals/welcome/Welcome.jsx b/src/components/modals/welcome/Welcome.jsx index 0704b295..abdd70b8 100644 --- a/src/components/modals/welcome/Welcome.jsx +++ b/src/components/modals/welcome/Welcome.jsx @@ -41,7 +41,7 @@ class WelcomeModal extends PureComponent { }); } - if (this.state.buttonText === variables.getMessage('modals.main.addons.create.finish.title')) { + if (this.state.buttonText === variables.getMessage('modals.welcome.buttons.finish')) { return this.props.modalClose(); } @@ -79,7 +79,7 @@ class WelcomeModal extends PureComponent { buttonText: Number(welcomeTab) !== this.state.finalTab + 1 ? variables.getMessage('modals.welcome.buttons.next') - : variables.getMessage('modals.welcome.buttons.next'), + : variables.getMessage('modals.welcome.buttons.finish'), }); } diff --git a/src/components/modals/welcome/WelcomeSections.jsx b/src/components/modals/welcome/WelcomeSections.jsx index aee011fb..aff74aac 100644 --- a/src/components/modals/welcome/WelcomeSections.jsx +++ b/src/components/modals/welcome/WelcomeSections.jsx @@ -150,9 +150,8 @@ class WelcomeSections extends PureComponent { alt="Example Mue setup" draggable={false} /> + #shareyourmue - - #shareyourmue
@@ -220,6 +219,15 @@ class WelcomeSections extends PureComponent { GitHub + + Weblate + +
diff --git a/src/components/modals/welcome/welcome.scss b/src/components/modals/welcome/welcome.scss index 6068bca5..8290257c 100644 --- a/src/components/modals/welcome/welcome.scss +++ b/src/components/modals/welcome/welcome.scss @@ -72,14 +72,17 @@ margin: 5px; transition: 0.2s ease-in-out; cursor: pointer; + border-radius: 10px 10px 0x 0; &:hover { - background: #7575e5; + background: #dd4038; + border-radius: 10px; + border-bottom: 2px solid #dd4038; } } .active { - background: #5352ed; - border-bottom: 2px solid #5352ed; + background: #d21a11; + border-bottom: 2px solid #d21a11; border-radius: 10px; } } @@ -192,12 +195,23 @@ a.privacy { } .examples { + display: flex; + flex-flow: column; + .shareYourMue { + width: fit-content; + } img { - width: 60%; + max-width: 60%; + border-radius: 10px 10px 10px 0px; + } +} - @include themed { - border-radius: t($borderRadius); - } +.shareYourMue { + padding: 8px 20px 8px 20px; + border-radius: 0px 0px 10px 10px; + letter-spacing: 2px; + @include themed { + background-color: t($modal-sidebarActive); } } @@ -249,9 +263,10 @@ a.privacy { } .icon { - @include themed { + background: linear-gradient(238.7deg, #ff5c25 13.8%, #d21a11 49.49%, #ff456e 87.48%); + /*@include themed { background-color: t($modal-sidebarActive); - } + }*/ height: 50px !important; width: 50px !important; @@ -260,6 +275,8 @@ a.privacy { place-items: center; text-align: center; flex-shrink: 0; + color: #f18d91; + font-size: 24px; } .text { diff --git a/src/components/widgets/background/scss/_photoinformation.scss b/src/components/widgets/background/scss/_photoinformation.scss index 34e3a0b3..f3c5c1a7 100644 --- a/src/components/widgets/background/scss/_photoinformation.scss +++ b/src/components/widgets/background/scss/_photoinformation.scss @@ -311,6 +311,8 @@ height: 50px; width: 50px; + flex-grow: 0; + flex-shrink: 0; border-radius: 12px; display: flex; align-items: center; diff --git a/src/modules/constants.js b/src/modules/constants.js index 9909cbc3..c0ff8e77 100644 --- a/src/modules/constants.js +++ b/src/modules/constants.js @@ -10,6 +10,7 @@ export const WEBSITE_URL = 'https://muetab.com'; export const PRIVACY_URL = 'https://muetab.com/privacy'; export const BLOG_POST = 'https://blog.muetab.com/posts/version-7-0'; export const TRANSLATIONS_URL = 'https://docs.muetab.com/translations/'; +export const WEBLATE_URL = 'https://hosted.weblate.org/projects/mue/mue-tab/'; export const REPORT_ITEM = 'https://github.com/mue/marketplace/issues/new?assignees=&labels=item+report&template=item-report.md&title=%5BItem+Report%5D+'; export const BUG_REPORT = diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index a76215fe..5344d5d8 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -36,7 +36,7 @@ $modal: ( 'tab-active': rgb(219 219 219 / 72%), 'sidebar-dark': rgb(53 59 72), 'tab-active-dark': rgb(65 71 84 / 90%), - 'modal-link': #5352ed, + 'modal-link': #d21a11, 'modal-link-dark': #3498db, ); $button-colours: ( @@ -66,7 +66,7 @@ $themes: ( 'modal-sidebar': rgb(240 240 240 / 100%), 'modal-sidebarActive': rgb(219 219 219 / 72%), 'modal-secondaryColour': #fafafa, - 'link': rgb(83 82 237 / 100%), + 'link': #5352ed, ), dark: ( 'weather': #e7e7e7,