Commit 75f1576f authored by Luke Schoen's avatar Luke Schoen
Browse files

review-fix: WIP - Use X.styles.js and not css from styled-components

* Rename to DivWindowContent.styles.js instead of DivWindowContent.js

* Move DivContent and DivWindow into from App.styles.js. Stop using css from styled-components
parent 284dbe05
......@@ -9,7 +9,7 @@ import { accountsInfo$, withoutLoading } from '@parity/light.js';
import { inject, observer } from 'mobx-react';
import light from '@parity/light.js-react';
import DivWindowContent from '../../assets/theme/shared/styledComponents/DivWindowContent';
import { DivWindowContent } from '../../assets/theme/shared/styledComponents/DivWindowContent.styles';
import Health from '../../Health';
import Feedback from './Feedback';
......
......@@ -10,7 +10,7 @@ import { inject, observer } from 'mobx-react';
import light from '@parity/light.js-react';
import { Link, Route } from 'react-router-dom';
import DivWindowContent from '../../assets/theme/shared/styledComponents/DivWindowContent';
import { DivWindowContent } from '../../assets/theme/shared/styledComponents/DivWindowContent.styles';
import AccountCopyPhrase from './AccountCopyPhrase';
import AccountImportOptions from './AccountImportOptions';
import AccountRewritePhrase from './AccountRewritePhrase';
......
......@@ -14,7 +14,7 @@ import {
import { inject, observer } from 'mobx-react';
import isElectron from 'is-electron';
import ReactResizeDetector from 'react-resize-detector';
import styled, { ThemeProvider } from 'styled-components';
import { ThemeProvider } from 'styled-components';
import Accounts from '../Accounts';
import BackupAccount from '../BackupAccount';
......@@ -25,15 +25,7 @@ import Tokens from '../Tokens';
import Whitelist from '../Whitelist';
import { fetherTheme, GlobalStyle } from '../assets/theme/globalStyle';
import { DivContentStyles, DivWindowStyles } from './style';
const DivContent = styled.div`
${DivContentStyles};
`;
const DivWindow = styled.div`
${DivWindowStyles};
`;
import { DivContent, DivWindow } from './App.styles';
// Use MemoryRouter for production viewing in file:// protocol
// https://github.com/facebook/create-react-app/issues/3591
......
......@@ -3,15 +3,15 @@
//
// SPDX-License-Identifier: BSD-3-Clause
import { css } from 'styled-components';
import styled from 'styled-components';
const DivContentStyles = css`
const DivContent = styled.div`
margin: 0 auto;
max-width: 22rem;
overflow: visible;
`;
const DivWindowStyles = css`
const DivWindow = styled.div`
background: ${props => props.theme.chrome};
border-radius: 0.25rem;
box-shadow: 0 0.125rem 0.75rem rgba(${props => props.theme.black}, 0.175),
......@@ -21,4 +21,4 @@ const DivWindowStyles = css`
position: relative;
`;
export { DivContentStyles, DivWindowStyles };
export { DivContent, DivWindow };
......@@ -8,7 +8,7 @@ import { Form as FetherForm, Header } from 'fether-ui';
import { inject, observer } from 'mobx-react';
import ReactMarkdown from 'react-markdown';
import DivWindowContent from '../assets/theme/shared/styledComponents/DivWindowContent';
import { DivWindowContent } from '../assets/theme/shared/styledComponents/DivWindowContent.styles';
import Health from '../Health';
import termsAndConditions from './termsAndConditions.md';
......
......@@ -11,7 +11,7 @@ import { withProps } from 'recompose';
import check from '../../assets/img/icons/check.svg';
import loading from '../../assets/img/icons/loading.svg';
import DivWindowContent from '../../assets/theme/shared/styledComponents/DivWindowContent';
import { DivWindowContent } from '../../assets/theme/shared/styledComponents/DivWindowContent.styles';
import withTokens from '../../utils/withTokens';
import { blockscoutTxUrl } from '../../utils/blockscout';
......
......@@ -10,7 +10,7 @@ import { inject, observer } from 'mobx-react';
import { Link, Redirect } from 'react-router-dom';
import { withProps } from 'recompose';
import DivWindowContent from '../../assets/theme/shared/styledComponents/DivWindowContent';
import { DivWindowContent } from '../../assets/theme/shared/styledComponents/DivWindowContent.styles';
import RequireHealth from '../../RequireHealthOverlay';
import TokenBalance from '../../Tokens/TokensList/TokenBalance';
import withAccount from '../../utils/withAccount.js';
......
......@@ -17,7 +17,7 @@ import { OnChange } from 'react-final-form-listeners';
import { withProps } from 'recompose';
import styled from 'styled-components';
import DivWindowContent from '../../assets/theme/shared/styledComponents/DivWindowContent';
import { DivWindowContent } from '../../assets/theme/shared/styledComponents/DivWindowContent.styles';
import { estimateGas } from '../../utils/estimateGas';
import RequireHealth from '../../RequireHealthOverlay';
import TokenBalance from '../../Tokens/TokensList/TokenBalance';
......
......@@ -5,7 +5,7 @@
import React, { Component } from 'react';
import DivWindowContent from '../../assets/theme/shared/styledComponents/DivWindowContent';
import { DivWindowContent } from '../../assets/theme/shared/styledComponents/DivWindowContent.styles';
import RequireHealth from '../../RequireHealthOverlay';
import TokenBalance from './TokenBalance';
import withTokens from '../../utils/withTokens';
......
......@@ -10,7 +10,7 @@ import { Header } from 'fether-ui';
import light from '@parity/light.js-react';
import { Link } from 'react-router-dom';
import DivWindowContent from '../assets/theme/shared/styledComponents/DivWindowContent';
import { DivWindowContent } from '../assets/theme/shared/styledComponents/DivWindowContent.styles';
import Health from '../Health';
import NewTokenItem from './NewTokenItem';
import withAccount from '../utils/withAccount';
......
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
// This file is part of Parity.
//
// SPDX-License-Identifier: BSD-3-Clause
import { DivWindowContent } from './DivWindowContent';
export default DivWindowContent;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment