fix: various fixes

This commit is contained in:
alexsparkes 2024-01-29 13:59:22 +00:00
parent acd6230399
commit afc1c603d2
10 changed files with 88 additions and 30 deletions

View File

@ -170,6 +170,12 @@ h5 {
gap: 20px; gap: 20px;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.link {
display: flex;
flex-flow: row;
gap: 15px;
align-items: center;
}
} }
.marketplaceCondition { .marketplaceCondition {

View File

@ -6,7 +6,7 @@
left: 0; left: 0;
position: sticky; position: sticky;
margin: 0; margin: 0;
padding: 0; padding: 0 5px 0 5px;
background: t($modal-sidebar); background: t($modal-sidebar);
border-radius: 12px 0 0 12px; border-radius: 12px 0 0 12px;
overflow-y: auto; overflow-y: auto;
@ -73,3 +73,8 @@
} }
} }
} }
.css-j204z7-MuiFormControlLabel-root {
margin-left: 0 !important;
margin-right: 0 !important;
}

View File

@ -63,17 +63,6 @@ class Header extends PureComponent {
)} )}
<span className="mainTitle">{this.props.title}</span> <span className="mainTitle">{this.props.title}</span>
<div className="headerActions"> <div className="headerActions">
<button
className="sideload"
onClick={() =>
window.open(
variables.constants.BUG_REPORT + this.props.title.split(' ').join('+'),
'_blank',
)
}
>
{variables.getMessage('modals.main.settings.sections.header.report_issue')} <MdFlag />
</button>
{this.props.switch && ( {this.props.switch && (
<button className="sideload" onClick={() => this.changeSetting()}> <button className="sideload" onClick={() => this.changeSetting()}>
{this.state[this.props.setting] ? ( {this.state[this.props.setting] ? (
@ -89,6 +78,17 @@ class Header extends PureComponent {
)} )}
</button> </button>
)} )}
<button
className="sideload"
onClick={() =>
window.open(
variables.constants.BUG_REPORT + this.props.title.split(' ').join('+'),
'_blank',
)
}
>
{variables.getMessage('modals.main.settings.sections.header.report_issue')} <MdFlag />
</button>
</div> </div>
</div> </div>
{this.props.zoomSetting && ( {this.props.zoomSetting && (

View File

@ -1,6 +1,8 @@
import variables from 'modules/variables'; import variables from 'modules/variables';
import { PureComponent } from 'react'; import { PureComponent } from 'react';
import { MdOutlineOpenInNew } from 'react-icons/md';
import Radio from '../Radio'; import Radio from '../Radio';
import languages from 'modules/languages.json'; import languages from 'modules/languages.json';
@ -67,9 +69,26 @@ export default class LanguageSettings extends PureComponent {
render() { render() {
return ( return (
<> <>
<span className="mainTitle"> <div className="flexTopMarketplace topAddons">
{variables.getMessage('modals.main.settings.sections.language.title')} <span className="mainTitle">
</span> {variables.getMessage('modals.main.settings.sections.language.title')}
</span>
<div className="headerActions">
{/*<a className="link" href="" target="_blank" rel="noopener noreferrer">
Improve
<MdOutlineOpenInNew />
</a>*/}
<a
className="link"
href="https://hosted.weblate.org/new-lang/mue/mue-tab/"
target="_blank"
rel="noopener noreferrer"
>
Add translation
<MdOutlineOpenInNew />
</a>
</div>
</div>
<div className="languageSettings"> <div className="languageSettings">
<Radio name="language" options={languages} element=".other" /> <Radio name="language" options={languages} element=".other" />
</div> </div>

View File

@ -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(); return this.props.modalClose();
} }
@ -79,7 +79,7 @@ class WelcomeModal extends PureComponent {
buttonText: buttonText:
Number(welcomeTab) !== this.state.finalTab + 1 Number(welcomeTab) !== this.state.finalTab + 1
? variables.getMessage('modals.welcome.buttons.next') ? variables.getMessage('modals.welcome.buttons.next')
: variables.getMessage('modals.welcome.buttons.next'), : variables.getMessage('modals.welcome.buttons.finish'),
}); });
} }

View File

@ -150,9 +150,8 @@ class WelcomeSections extends PureComponent {
alt="Example Mue setup" alt="Example Mue setup"
draggable={false} draggable={false}
/> />
<span className="shareYourMue">#shareyourmue</span>
</div> </div>
<span className="link">#shareyourmue</span>
<div className="welcomeNotice"> <div className="welcomeNotice">
<div className="icon"> <div className="icon">
<MdOutlineWavingHand /> <MdOutlineWavingHand />
@ -220,6 +219,15 @@ class WelcomeSections extends PureComponent {
GitHub GitHub
<MdOutlineOpenInNew /> <MdOutlineOpenInNew />
</a> </a>
<a
href={variables.constants.WEBLATE_URL}
className="link"
target="_blank"
rel="noopener noreferrer"
>
Weblate
<MdOutlineOpenInNew />
</a>
<div className="languageSettings"> <div className="languageSettings">
<Radio name="language" options={languages} category="welcomeLanguage" /> <Radio name="language" options={languages} category="welcomeLanguage" />
</div> </div>

View File

@ -72,14 +72,17 @@
margin: 5px; margin: 5px;
transition: 0.2s ease-in-out; transition: 0.2s ease-in-out;
cursor: pointer; cursor: pointer;
border-radius: 10px 10px 0x 0;
&:hover { &:hover {
background: #7575e5; background: #dd4038;
border-radius: 10px;
border-bottom: 2px solid #dd4038;
} }
} }
.active { .active {
background: #5352ed; background: #d21a11;
border-bottom: 2px solid #5352ed; border-bottom: 2px solid #d21a11;
border-radius: 10px; border-radius: 10px;
} }
} }
@ -192,12 +195,23 @@ a.privacy {
} }
.examples { .examples {
display: flex;
flex-flow: column;
.shareYourMue {
width: fit-content;
}
img { img {
width: 60%; max-width: 60%;
border-radius: 10px 10px 10px 0px;
}
}
@include themed { .shareYourMue {
border-radius: t($borderRadius); 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 { .icon {
@include themed { background: linear-gradient(238.7deg, #ff5c25 13.8%, #d21a11 49.49%, #ff456e 87.48%);
/*@include themed {
background-color: t($modal-sidebarActive); background-color: t($modal-sidebarActive);
} }*/
height: 50px !important; height: 50px !important;
width: 50px !important; width: 50px !important;
@ -260,6 +275,8 @@ a.privacy {
place-items: center; place-items: center;
text-align: center; text-align: center;
flex-shrink: 0; flex-shrink: 0;
color: #f18d91;
font-size: 24px;
} }
.text { .text {

View File

@ -311,6 +311,8 @@
height: 50px; height: 50px;
width: 50px; width: 50px;
flex-grow: 0;
flex-shrink: 0;
border-radius: 12px; border-radius: 12px;
display: flex; display: flex;
align-items: center; align-items: center;

View File

@ -10,6 +10,7 @@ export const WEBSITE_URL = 'https://muetab.com';
export const PRIVACY_URL = 'https://muetab.com/privacy'; export const PRIVACY_URL = 'https://muetab.com/privacy';
export const BLOG_POST = 'https://blog.muetab.com/posts/version-7-0'; export const BLOG_POST = 'https://blog.muetab.com/posts/version-7-0';
export const TRANSLATIONS_URL = 'https://docs.muetab.com/translations/'; 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 = export const REPORT_ITEM =
'https://github.com/mue/marketplace/issues/new?assignees=&labels=item+report&template=item-report.md&title=%5BItem+Report%5D+'; 'https://github.com/mue/marketplace/issues/new?assignees=&labels=item+report&template=item-report.md&title=%5BItem+Report%5D+';
export const BUG_REPORT = export const BUG_REPORT =

View File

@ -36,7 +36,7 @@ $modal: (
'tab-active': rgb(219 219 219 / 72%), 'tab-active': rgb(219 219 219 / 72%),
'sidebar-dark': rgb(53 59 72), 'sidebar-dark': rgb(53 59 72),
'tab-active-dark': rgb(65 71 84 / 90%), 'tab-active-dark': rgb(65 71 84 / 90%),
'modal-link': #5352ed, 'modal-link': #d21a11,
'modal-link-dark': #3498db, 'modal-link-dark': #3498db,
); );
$button-colours: ( $button-colours: (
@ -66,7 +66,7 @@ $themes: (
'modal-sidebar': rgb(240 240 240 / 100%), 'modal-sidebar': rgb(240 240 240 / 100%),
'modal-sidebarActive': rgb(219 219 219 / 72%), 'modal-sidebarActive': rgb(219 219 219 / 72%),
'modal-secondaryColour': #fafafa, 'modal-secondaryColour': #fafafa,
'link': rgb(83 82 237 / 100%), 'link': #5352ed,
), ),
dark: ( dark: (
'weather': #e7e7e7, 'weather': #e7e7e7,