mirrors/mue
1
0
Fork 0
mirror of https://github.com/mue/mue.git synced 2026-07-18 06:24:17 +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'}>

89
src/translations/en_GB.json
View File

@@ -70,26 +70,26 @@
},
"analogue": {
"title": "Analogue",
"second_hand": "Seconds Hand",
"minute_hand": "Minutes Hand",
"hour_hand": "Hours Hand",
"hour_marks": "Hour Marks",
"minute_marks": "Minute Marks"
"second_hand": "Seconds hand",
"minute_hand": "Minutes hand",
"hour_hand": "Hours hand",
"hour_marks": "Hour marks",
"minute_marks": "Minute marks"
},
"percentage_complete": "Percentage Complete",
"percentage_complete": "Percentage complete",
"date": {
"title": "Date",
"week_number": "Week Number",
"week_number": "Week number",
"day_of_week": "Day of week",
"datenth": "Date nth",
"type": {
"short": "Short",
"long": "Long"
},
"short_date": "Short Date",
"short_format": "Short Format",
"short_date": "Short date",
"short_format": "Short format",
"short_separator": {
"title": "Short Separator",
"title": "Short separator",
"dots": "Dots",
"dash": "Dash",
"gaps": "Gaps",
@@ -99,9 +99,9 @@
},
"quote": {
"title": "Quote",
"author_link": "Authour Link",
"custom": "Custom Quote",
"custom_author": "Custom Authour",
"author_link": "Authour link",
"custom": "Custom quote",
"custom_author": "Custom authour",
"buttons": {
"title": "Buttons",
"copy": "Copy",
@@ -112,15 +112,15 @@
"greeting": {
"title": "Greeting",
"events": "Events",
"default": "Default Greeting Message",
"default": "Default greeting message",
"name": "Name for greeting",
"birthday": "Birthday",
"birthday_age": "Birthday Age",
"birthday_date": "Birthday Date"
"birthday_age": "Birthday age",
"birthday_date": "Birthday date"
},
"background": {
"title": "Background",
"ddg_proxy": "Use DuckDuckGo Image Proxy",
"ddg_proxy": "Use DuckDuckGo image proxy",
"transition": "Fade-in transition",
"buttons": {
"title": "Buttons",
@@ -130,46 +130,46 @@
},
"effects": {
"title": "Effects",
"blur": "Adjust Blur",
"brightness": "Adjust Brightness"
"blur": "Adjust blur",
"brightness": "Adjust brightness"
},
"type": {
"title": "Type",
"api": "API",
"custom_image": "Custom Image",
"custom_colour": "Custom Colour/Gradient"
"custom_image": "Custom image",
"custom_colour": "Custom colour/gradient"
},
"source": {
"title": "Source",
"api": "Background API",
"custom_url": "Custom Background URL",
"custom_background": "Custom Background",
"custom_colour": "Custom Background Colour",
"custom_url": "Custom background URL",
"custom_background": "Custom background",
"custom_colour": "Custom background colour",
"upload": "Upload",
"add_colour": "Add colour",
"disabled": "Disabled",
"loop_video": "Loop Video",
"mute_video": "Mute Video"
"loop_video": "Loop video",
"mute_video": "Mute video"
}
},
"search": {
"title": "Search",
"search_engine": "Search Engine",
"custom": "Custom Search URL",
"voice_search": "Voice Search"
"search_engine": "Search engine",
"custom": "Custom search URL",
"voice_search": "Voice search"
},
"weather": {
"title": "Weather",
"location": "Location",
"auto": "Auto",
"temp_format": {
"title": "Temperature Format",
"title": "Temperature format",
"celsius": "Celsius",
"fahrenheit": "Fahrenheit",
"kelvin": "Kelvin"
},
"extra_info": {
"title": "Extra Information",
"title": "Extra information",
"humidity": "Humidity",
"wind_speed": "Wind speed",
"min_temp": "Minimum temperature",
@@ -190,19 +190,18 @@
"light": "Light",
"dark": "Dark"
},
"night_mode": "Night Mode",
"animations": "Animations",
"navbar": {
"title": "Navbar",
"notes": "Notes",
"refresh": "Refresh Button"
"refresh": "Refresh button"
},
"font": {
"title": "Font",
"custom": "Custom Font",
"custom": "Custom font",
"google": "Import from Google Fonts",
"weight": {
"title": "Font Weight",
"title": "Font weight",
"thin": "Thin",
"extra_light": "Extra Light",
"light": "Light",
@@ -213,7 +212,7 @@
"extra_bold": "Extra-Bold"
},
"style": {
"title": "Font Style",
"title": "Font style",
"normal": "Normal",
"italic": "Italic",
"oblique": "Oblique"
@@ -221,8 +220,8 @@
},
"accessibility": {
"title": "Accessibility",
"widget_zoom": "Widget Zoom",
"toast_duration": "Toast Duration",
"widget_zoom": "Widget zoom",
"toast_duration": "Toast duration",
"milliseconds": "milliseconds"
}
},
@@ -231,7 +230,7 @@
},
"advanced": {
"title": "Advanced",
"offline_mode": "Offline Mode",
"offline_mode": "Offline mode",
"data": "Data",
"reset_modal": {
"title": "WARNING",
@@ -242,7 +241,7 @@
"customisation": "Customisation",
"custom_css": "Custom CSS",
"custom_js": "Custom JS",
"tab_name": "Tab Name",
"tab_name": "Tab name",
"experimental_warning": "Please note that the Mue team cannot provide support if you have experimental mode on. Please disable it first and see if the issue continues to occur before contacting support."
},
"experimental": {
@@ -252,7 +251,7 @@
},
"language": {
"title": "Language",
"quote": "Quote Language"
"quote": "Quote language"
},
"changelog": "Change Log",
"about": {
@@ -266,10 +265,10 @@
"offline_mode": "Cannot check for update in offline mode"
},
"resources_used": {
"title": "Resources Used",
"bg_images": "Offline Background Images",
"welcome_img": "Welcome Image",
"pin_icon": "Pin Icon"
"title": "Resources used",
"bg_images": "Offline background images",
"welcome_img": "Welcome image",
"pin_icon": "Pin icon"
},
"contributors": "Contributors",
"supporters": "Supporters",