diff --git a/src/components/modals/main/scss/index.scss b/src/components/modals/main/scss/index.scss index d2bae84b..1bea9a71 100644 --- a/src/components/modals/main/scss/index.scss +++ b/src/components/modals/main/scss/index.scss @@ -266,7 +266,7 @@ li { svg { margin-right: 0.5rem; padding: 3px; - font-size: 1.4em !important; + vertical-align: middle; } } diff --git a/src/components/widgets/background/Maximise.jsx b/src/components/widgets/background/Maximise.jsx index 306b2b91..ea39ff8d 100644 --- a/src/components/widgets/background/Maximise.jsx +++ b/src/components/widgets/background/Maximise.jsx @@ -12,11 +12,17 @@ export default class Maximise extends React.PureComponent { }; } - setAttribute(blur, brightness) { + setAttribute(blur, brightness, filter) { const element = document.getElementById('backgroundImage'); + + let backgroundFilter; + if (filter === true) { + backgroundFilter = localStorage.getItem('backgroundFilter'); + } + element.setAttribute( 'style', - `background-image: url(${element.style.backgroundImage.replace('url("', '').replace('")', '')}); -webkit-filter: blur(${blur}px) brightness(${brightness}%);` + `background-image: url(${element.style.backgroundImage.replace('url("', '').replace('")', '')}); -webkit-filter: blur(${blur}px) brightness(${brightness}%) ${backgroundFilter ? backgroundFilter + '(' + localStorage.getItem('backgroundFilterAmount') + '%)' : ''};` ); } @@ -43,7 +49,7 @@ export default class Maximise extends React.PureComponent { hidden: false }); - this.setAttribute(localStorage.getItem('blur'), localStorage.getItem('brightness')); + this.setAttribute(localStorage.getItem('blur'), localStorage.getItem('brightness'), true); } }