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

fix: various bug fixes

Browse Source
This commit is contained in:
David Ralph
2021-04-12 11:45:33 +01:00
parent 9d09ece8b7
commit cc341300b4
7 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/modals/main/Main.jsx
View File

@@ -8,7 +8,10 @@ const Settings = React.lazy(() => import('./tabs/Settings'));
const Addons = React.lazy(() => import('./tabs/Addons'));
const Marketplace = React.lazy(() => import('./tabs/Marketplace'));
const renderLoader = () => <></>;
const renderLoader = () => (<Tabs>
<div label=''>{window.language.modals.main.loading}</div>
<div label=''>{window.language.modals.main.loading}</div>
</Tabs>);
export default function MainModal(props) {
const language = window.language.modals.main.navbar;

2
src/components/modals/main/scss/index.scss
View File

@@ -244,7 +244,7 @@ li {
display: inline-flex;
&:hover {
color: rgb(105, 105, 105);
color: rgb(165, 165, 165);
}
}

2
src/components/modals/main/scss/settings/_main.scss
View File

@@ -109,7 +109,7 @@ input[type=color]::-moz-color-swatch {
margin-left: 0;
}
.MuiCheckbox-colorPrimary.Mui-checked, .MuiSwitch-colorPrimary.Mui-checked, .MuIconButton-colorPrimary.Mui-checked, .MuiSwitch-thumb, .MuiRadio-colorSecondary.Mui-checked {
.MuiCheckbox-colorPrimary.Mui-checked, .MuiSwitch-colorPrimary.Mui-checked, .MuIconButton-colorPrimary.Mui-checked, .MuiSwitch-thumb, .MuiRadio-colorSecondary.Mui-checked, .PrivateSwitchBase-input-4 {
color: var(--modal-text) !important;
}

2
src/components/modals/main/settings/sections/About.jsx
View File

@@ -26,7 +26,7 @@ export default class About extends React.PureComponent {
try {
contributors = await (await fetch(window.constants.GITHUB_URL + '/repos/mue/mue/contributors')).json();
sponsors = (await (await fetch(window.constants.SPONSORS_URL + '/list')).json()).sponsors;
photographers = await (await fetch(window.constants.API_URL + '/getPhotographers')).json();
photographers = await (await fetch(window.constants.API_URL + '/images/photographers')).json();
versionData = await (await fetch(window.constants.GITHUB_URL + '/repos/mue/mue/releases')).json();
} catch (e) {

9
src/components/widgets/background/Background.jsx
View File

@@ -62,9 +62,10 @@ export default class Background extends React.PureComponent {
if (this.state.url !== '') {
const url = this.ddgproxy ? window.constants.DDG_PROXY + this.state.url : this.state.url;
const backgroundImage = document.querySelector('#backgroundImage');
const photoInformation = document.querySelector('.photoInformation');
if (localStorage.getItem('bgtransition') === 'false') {
document.querySelector('.photoInformation').style.display = 'block';
photoInformation.style.display = 'block';
return backgroundImage.setAttribute(
'style',
@@ -73,6 +74,7 @@ export default class Background extends React.PureComponent {
}
backgroundImage.classList.add('backgroundPreload');
photoInformation.classList.add('backgroundPreload');
// preloader for background transition
let preloader = document.createElement('img');
@@ -91,9 +93,8 @@ export default class Background extends React.PureComponent {
// wait before showing photoinformation, should make this better with state or something later but lazy
if (this.state.photoInfo.hidden !== false) {
setTimeout(() => {
document.querySelector('.photoInformation').style.display = 'block';
}, 800);
photoInformation.classList.remove('backgroundPreload');
document.querySelector('.photoInformation').classList.add('fade-in');
}
});
} else {

2
src/components/widgets/background/PhotoInformation.jsx
View File

@@ -30,7 +30,7 @@ export default function PhotoInformation(props) {
}
return (
<div className='photoInformation' style={{ 'display': 'none' }}>
<div className='photoInformation'>
<h1>{language.credit} <span id='credit'>{props.info.credit}</span></h1>
<Info className='photoInformationHover'/>
<div className={props.className || 'infoCard'}>