From ac138f6a4c25f578ea673956fbc1b906df7ca4e9 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 25 Apr 2017 11:53:19 +0200 Subject: [PATCH] Remove ParityBackground (#5501) --- js/src/ui/Portal/portal.css | 10 ---------- js/src/ui/Portal/portal.js | 2 -- js/src/ui/index.js | 1 - js/src/views/ParityBar/parityBar.css | 2 +- js/src/views/ParityBar/parityBar.js | 6 +++--- js/src/views/ParityBar/parityBar.spec.js | 4 ---- js/src/views/Settings/Background/background.js | 3 ++- 7 files changed, 6 insertions(+), 22 deletions(-) diff --git a/js/src/ui/Portal/portal.css b/js/src/ui/Portal/portal.css index 85e8be4f1..a2a1edce7 100644 --- a/js/src/ui/Portal/portal.css +++ b/js/src/ui/Portal/portal.css @@ -44,16 +44,6 @@ $popoverZ: 3600; z-index: $modalBackZ; } -.parityBackground { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - opacity: 0.25; - z-index: -1; -} - .overlay { background-color: rgba(0, 0, 0, 1); box-sizing: border-box; diff --git a/js/src/ui/Portal/portal.js b/js/src/ui/Portal/portal.js index 6b2d7f8b2..47639dd86 100644 --- a/js/src/ui/Portal/portal.js +++ b/js/src/ui/Portal/portal.js @@ -22,7 +22,6 @@ import { noop } from 'lodash'; import { nodeOrStringProptype } from '~/util/proptypes'; import { CloseIcon } from '~/ui/Icons'; -import ParityBackground from '~/ui/ParityBackground'; import StackEventListener from '~/ui/StackEventListener'; import Title from '~/ui/Title'; @@ -99,7 +98,6 @@ export default class Portal extends Component { onKeyDown={ this.handleKeyDown } > - { this.renderClose() } - <ParityBackground + <div className={ parityBgClassNames.join(' ') } ref='container' style={ parityBgStyle } @@ -201,7 +201,7 @@ class ParityBar extends Component { ? this.renderExpanded() : this.renderBar() } - </ParityBackground> + </div> </div> ); } diff --git a/js/src/views/ParityBar/parityBar.spec.js b/js/src/views/ParityBar/parityBar.spec.js index 013d0fd4c..51f714fc4 100644 --- a/js/src/views/ParityBar/parityBar.spec.js +++ b/js/src/views/ParityBar/parityBar.spec.js @@ -68,10 +68,6 @@ describe('views/ParityBar', () => { expect(component).to.be.ok; }); - it('includes the ParityBackground', () => { - expect(component.find('Connect(ParityBackground)')).to.have.length(1); - }); - describe('renderBar', () => { let bar; diff --git a/js/src/views/Settings/Background/background.js b/js/src/views/Settings/Background/background.js index fd271111a..dd348a4c4 100644 --- a/js/src/views/Settings/Background/background.js +++ b/js/src/views/Settings/Background/background.js @@ -19,7 +19,8 @@ import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import { Button, Container, ParityBackground } from '~/ui'; +import { Button, Container } from '~/ui'; +import ParityBackground from '~/ui/ParityBackground'; import { RefreshIcon } from '~/ui/Icons'; import { updateBackground } from '~/redux/providers/settings/actions';