diff --git a/manifest/chrome.json b/manifest/chrome.json index 0a4d5666..687bf087 100644 --- a/manifest/chrome.json +++ b/manifest/chrome.json @@ -15,5 +15,6 @@ "16": "icons/16x16.png", "48": "icons/48x48.png", "128": "icons/128x128.png" - } + }, + "content_security_policy": "script-src 'self' https://api.bing.com https://www.google.com; object-src 'self'" } diff --git a/manifest/firefox.json b/manifest/firefox.json index 673fd476..58537ffd 100644 --- a/manifest/firefox.json +++ b/manifest/firefox.json @@ -17,5 +17,6 @@ }, "chrome_settings_overrides": { "homepage": "index.html" - } + }, + "content_security_policy": "script-src 'self' https://api.bing.com https://www.google.com; object-src 'self'" } diff --git a/src/components/modals/main/settings/sections/background/Background.jsx b/src/components/modals/main/settings/sections/background/Background.jsx index 1f45d75c..23c2b1ef 100644 --- a/src/components/modals/main/settings/sections/background/Background.jsx +++ b/src/components/modals/main/settings/sections/background/Background.jsx @@ -98,16 +98,16 @@ export default class BackgroundSettings extends React.PureComponent { const apiOptions = [ { - 'name': 'Mue', - 'value': 'mue' + name: 'Mue', + value: 'mue' }, { - 'name': 'Unsplash', - 'value': 'unsplash' + name: 'Unsplash', + value: 'unsplash' }, { - 'name': 'Pexels', - 'value': 'pexels' + name: 'Pexels', + value: 'pexels' } ]; @@ -122,7 +122,7 @@ export default class BackgroundSettings extends React.PureComponent { ))}

- + diff --git a/src/components/modals/main/settings/sections/background/Colour.jsx b/src/components/modals/main/settings/sections/background/Colour.jsx index 0cd029a2..7890aa03 100644 --- a/src/components/modals/main/settings/sections/background/Colour.jsx +++ b/src/components/modals/main/settings/sections/background/Colour.jsx @@ -11,7 +11,7 @@ import 'react-color-gradient-picker/dist/index.css'; import '../../../scss/settings/react-color-picker-gradient-picker-custom-styles.scss'; export default class ColourSettings extends React.PureComponent { - DefaultGradientSettings = { 'angle': '180', 'gradient': [{ 'colour': '#ffb032', 'stop': 0 }], 'type': 'linear' }; + DefaultGradientSettings = { angle: '180', gradient: [{ colour: '#ffb032', stop: 0 }], type: 'linear' }; GradientPickerInitalState = undefined; constructor() { @@ -84,6 +84,12 @@ export default class ColourSettings extends React.PureComponent { }; return newState; }); + + const reminderInfo = document.querySelector('.reminder-info'); + if (reminderInfo.style.display !== 'block') { + reminderInfo.style.display = 'block'; + localStorage.setItem('showReminder', true); + } } addColour = () => { @@ -92,7 +98,7 @@ export default class ColourSettings extends React.PureComponent { const newState = { gradientSettings: { ...s.gradientSettings, - gradient: [...initGradients, lastGradient, { 'colour': localStorage.getItem('theme') === 'dark' ? '#000000' : '#ffffff', stop: 100 }].sort((a, b) => (a.stop > b.stop) ? 1 : -1) + gradient: [...initGradients, lastGradient, { colour: localStorage.getItem('theme') === 'dark' ? '#000000' : '#ffffff', stop: 100 }].sort((a, b) => (a.stop > b.stop) ? 1 : -1) } }; return newState; @@ -117,15 +123,21 @@ export default class ColourSettings extends React.PureComponent { this.setState({ gradientSettings: { - 'angle': attrs.degree, - 'gradient': attrs.points.map((p) => { + angle: attrs.degree, + gradient: attrs.points.map((p) => { return { - 'colour': '#' + rgbToHex(p.red, p.green, p.blue), - 'stop': p.left + colour: '#' + rgbToHex(p.red, p.green, p.blue), + stop: p.left }}), - 'type': attrs.type + type: attrs.type } }); + + const reminderInfo = document.querySelector('.reminder-info'); + if (reminderInfo.style.display !== 'block') { + reminderInfo.style.display = 'block'; + localStorage.setItem('showReminder', true); + } }; render() {