Skip to content

Commit

Permalink
Merge pull request #195 from poanetwork/fix/#194-ETH-classic-styles-c…
Browse files Browse the repository at this point in the history
…hanges

(fix) Feedback on #194
  • Loading branch information
akolotov authored Mar 27, 2019
2 parents bb5f96c + ff7b7f0 commit 622a801
Show file tree
Hide file tree
Showing 16 changed files with 91 additions and 81 deletions.
2 changes: 2 additions & 0 deletions scripts/selectTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ const fs = require('fs');
const stylePath = path.resolve(__dirname, '..', 'src', 'assets', 'stylesheets');
const destinationFilename = 'application.css';
let filename;

if (process.env.APP_STYLES === 'classic') {
filename = 'application.classic.css'
} else {
filename = 'application.core.css'
}

fs.copyFileSync(path.resolve(stylePath, filename), path.resolve(stylePath, destinationFilename));
5 changes: 2 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ export class App extends React.Component {
<Route component={SweetAlert}/>
<Route render={() =>
<Header
showMobileMenu={showMobileMenu}
onMenuToggle={this.toggleMobileMenu}
showMobileMenu={showMobileMenu}
/>
}/>
<div className="app-container">
Expand All @@ -53,8 +53,7 @@ export class App extends React.Component {
<ModalContainer
showModal={showDisclaimer}
>
<Disclaimer
onConfirmation={this.closeDisclaimer} />
<Disclaimer onConfirmation={this.closeDisclaimer} />
</ModalContainer>
<NoWallet showModal={!showDisclaimer} />
</div>
Expand Down
21 changes: 6 additions & 15 deletions src/assets/images/themes/ethereum-classic/logos/logo-foreign.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 3 additions & 26 deletions src/assets/images/themes/ethereum-classic/logos/logo-loading.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 622a801

Please sign in to comment.