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

fix: background hot reload, settings issue, remove navbar hover setting

Browse Source
This commit is contained in:
David Ralph
2021-06-16 12:05:03 +01:00
parent dcddd78164
commit de1797c662
15 changed files with 53 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ export default class About extends React.PureComponent {
async getGitHubData() {
let contributors, sponsors, photographers, versionData;
try {
contributors = await (await fetch(window.constants.GITHUB_URL + '/repos/mue/mue/contributors', { signal: this.controller.signal })).json();
sponsors = (await (await fetch(window.constants.SPONSORS_URL + '/list', { signal: this.controller.signal })).json()).sponsors;

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

@@ -32,7 +32,6 @@ export default function AppearanceSettings() {
<h3>{appearance.navbar.title}</h3>
<Checkbox name='notesEnabled' text={appearance.navbar.notes} element='.other' />
<Checkbox name='refresh' text={appearance.navbar.refresh} element='.other' />
<Checkbox name='navbarHover' text={appearance.navbar.hover} element='.other' />
<h3>{appearance.font.title}</h3>
<Text title={appearance.font.custom} name='font' upperCaseFirst={true} category='other' />

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

@@ -299,7 +299,10 @@ export default class Background extends React.PureComponent {
document.getElementById('backgroundVideo').style.display = 'block';
} else {
if (this.state.photoInfo.hidden === false) {
document.querySelector('.photoInformation').style.display = 'block';
// fix bug
try {
document.querySelector('.photoInformation').style.display = 'block';
} catch (e) {}
}
element.style.display = 'block';

53
src/components/widgets/navbar/Navbar.jsx
View File

@@ -13,40 +13,35 @@ import Tooltip from '../../helpers/tooltip/Tooltip';
import './scss/index.scss';
export default function Navbar(props) {
const language = window.language;
const backgroundEnabled = (localStorage.getItem('background') === 'true');
return (
<>
{(localStorage.getItem('navbarHover') === 'true') ? <div className='navbar-hidden'/> : null}
<div className='navbar-container'>
{(localStorage.getItem('view') === 'true' && backgroundEnabled) ? <Maximise/> : null}
{(localStorage.getItem('favouriteEnabled') === 'true' && backgroundEnabled) ? <Favourite/> : null}
<div className='navbar-container'>
{(localStorage.getItem('view') === 'true' && backgroundEnabled) ? <Maximise/> : null}
{(localStorage.getItem('favouriteEnabled') === 'true' && backgroundEnabled) ? <Favourite/> : null}
{(localStorage.getItem('notesEnabled') === 'true') ?
<div className='notes'>
<NotesIcon className='topicons'/>
<Notes/>
</div>
:null}
{(localStorage.getItem('notesEnabled') === 'true') ?
<div className='notes'>
<NotesIcon className='topicons'/>
<Notes/>
</div>
: null}
{(window.constants.BETA_VERSION === true) ?
<Tooltip title={language.widgets.navbar.tooltips.feedback}>
<Report className='topicons' onClick={() => props.openModal('feedbackModal')}/>
</Tooltip>
: null}
{(localStorage.getItem('refresh') === 'true') ?
<Tooltip title={language.widgets.navbar.tooltips.refresh}>
<RefreshIcon className='refreshicon topicons' onClick={() => window.location.reload()}/>
</Tooltip>
: null}
<Tooltip title={language.modals.main.navbar.settings}>
<Gear className='settings-icon topicons' onClick={() => props.openModal('mainModal')}/>
{(window.constants.BETA_VERSION === true) ?
<Tooltip title={window.language.widgets.navbar.tooltips.feedback}>
<Report className='topicons' onClick={() => props.openModal('feedbackModal')}/>
</Tooltip>
</div>
</>
: null}
{(localStorage.getItem('refresh') === 'true') ?
<Tooltip title={window.language.widgets.navbar.tooltips.refresh}>
<RefreshIcon className='refreshicon topicons' onClick={() => window.location.reload()}/>
</Tooltip>
: null}
<Tooltip title={window.language.modals.main.navbar.settings}>
<Gear className='settings-icon topicons' onClick={() => props.openModal('mainModal')}/>
</Tooltip>
</div>
);
}

21
src/components/widgets/navbar/scss/index.scss
View File

@@ -36,24 +36,3 @@
.visibilityshow {
visibility: visible !important;
}
.navbar-hidden {
position: absolute;
width: 50vw;
right: 0;
top: 0;
background: none;
height: 75px;
+.navbar-container {
display: none;
}
&:hover {
display: block;
+.navbar-container {
display: block !important;
}
}
}