mirrors/mue
1
0
Fork 0
mirror of https://github.com/mue/mue.git synced 2026-07-23 00:37:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: various modal fixes and improvements

Browse Source 
Co-authored-by: Alex Sparkes <turbomarshmello@gmail.com>
This commit is contained in:
David Ralph
2022-07-15 22:00:55 +01:00
parent 9648b75f52
commit fc3340e374
11 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/modals/main/settings/sections/background/Background.jsx
View File

@@ -102,6 +102,7 @@ export default class BackgroundSettings extends PureComponent {
<SettingsItem
title={getMessage('modals.main.settings.sections.background.api')}
subtitle={getMessage('modals.main.settings.sections.background.api_subtitle')}
final={true}
>
{this.state.backgroundCategories[0] === getMessage('modals.main.loading') ? (
<>
@@ -206,7 +207,7 @@ export default class BackgroundSettings extends PureComponent {
if (this.state.effects === true) {
header = (
<span className="mainTitle" onClick={() => this.setState({ effects: false })}>
{getMessage('modals.main.settings.sections.background.title')}{' '}
<span className='backTitle'>{getMessage('modals.main.settings.sections.background.title')}</span>
<MdOutlineKeyboardArrowRight />{' '}
{getMessage('modals.main.settings.sections.background.effects.title')}
</span>
@@ -232,6 +233,7 @@ export default class BackgroundSettings extends PureComponent {
/>
);
}
return (
<>
{header}
@@ -282,7 +284,9 @@ export default class BackgroundSettings extends PureComponent {
</Dropdown>
</div>
</div>
<div className="moreSettings" onClick={() => this.setState({ effects: true })}>
{(this.state.backgroundType === 'api' ||
this.state.backgroundType === 'custom' ||
this.state.marketplaceEnabled) ? <><div className="moreSettings" onClick={() => this.setState({ effects: true })}>
<div className="left">
<MdOutlineAutoAwesome />
<div className="content">
@@ -298,10 +302,12 @@ export default class BackgroundSettings extends PureComponent {
{' '}
<MdOutlineKeyboardArrowRight />
</div>
</div>
</div></> : null}
</>
) : null}
{this.state.backgroundSettingsSection !== true && this.state.effects !== true ? (
{this.state.backgroundSettingsSection !== true && this.state.effects !== true && (this.state.backgroundType === 'api' ||
this.state.backgroundType === 'custom' ||
this.state.marketplaceEnabled) ? (
<SettingsItem
title={getMessage('modals.main.settings.sections.background.display')}
subtitle={getMessage('modals.main.settings.sections.background.display_subtitle')}
@@ -340,6 +346,7 @@ export default class BackgroundSettings extends PureComponent {
<SettingsItem
title={getMessage('modals.main.settings.sections.background.source.title')}
subtitle={getMessage('modals.main.settings.sections.background.source.subtitle')}
final={this.state.backgroundType === 'random_colour' || this.state.backgroundType === 'random_gradient'}
>
<Dropdown
label={getMessage('modals.main.settings.sections.background.type.title')}

1
src/components/modals/main/settings/sections/background/Colour.jsx
View File

@@ -223,6 +223,7 @@ export default class ColourSettings extends PureComponent {
<>
<SettingsItem
title={this.getMessage('modals.main.settings.sections.background.source.custom_colour')}
final={true}
>
<span className="link" onClick={() => this.resetColour()}>
{this.getMessage('modals.main.settings.buttons.reset')}