Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: misc enhancements for release 2.6.0 #2001

Merged
merged 5 commits into from
Oct 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/assets/images/alternate-logo-light-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/alternate-logo-light-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/background.tiff
Binary file not shown.
Binary file modified app/assets/images/background@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ a {
padding-top: 0px;
padding-bottom: 0;
font-size: 13px;
max-height: 220px;
height: 220px;

.gridContainer {
display: grid;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import React from 'react'

import lightLogo from '../../assets/images/alternate-logo-light-2.png'
import darkLogo from '../../assets/images/alternate-logo-light-1.png'
import styles from './LogoWithStrikethrough.scss'

export default class LogoWithStrikethrough extends React.Component {
export default class LogoWithStrikethrough extends React.Component<Props> {
render() {
return (
<div className={styles.logoWithStrikethroughContainer}>
<div className={styles.strikethrough} />
<img src={lightLogo} alt="" />
<img src={this.props.theme === 'Dark' ? lightLogo : darkLogo} alt="" />
<div className={styles.strikethrough} />
</div>
)
Expand Down
5 changes: 4 additions & 1 deletion app/components/LogoWithStrikethrough/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import { compose } from 'recompose'

import LogoWithStrikethrough from './LogoWithStrikethrough'
import withThemeData from '../../hocs/withThemeData'

export default LogoWithStrikethrough
export default compose(withThemeData())(LogoWithStrikethrough)
2 changes: 1 addition & 1 deletion app/components/Modals/BaseModal/BaseModal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@
flex: 1 1 auto;
display: flex;
flex-direction: column;
overflow-y: auto;
overflow-y: hidden;
}
4 changes: 4 additions & 0 deletions app/components/Modals/ReceiveModal/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ label {
.buttonContainer {
margin-top: auto;
margin-bottom: 50px;

svg {
margin-bottom: 50px;
}
}

.urlSection,
Expand Down
1 change: 1 addition & 0 deletions app/components/Panel/FullHeightPanel/FullHeightPanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
justify-content: center;
flex: 1;
height: 100%;
overflow-y: auto;
}

.header {
Expand Down
8 changes: 0 additions & 8 deletions app/components/Receive/ReceivePanel/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@
}
}

.copy {
svg {
path {
fill: #4cffb3;
}
}
}

.dynamicReceiveContent {
display: flex;
}
Expand Down
1 change: 0 additions & 1 deletion app/containers/News/News.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
display: flex;
flex-direction: column;
height: 100%;
justify-content: center;
}

.newsItemsContainer {
Expand Down
1 change: 1 addition & 0 deletions app/containers/TransactionHistory/TransactionHistory.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

.transactionHistoryPanel {
flex: 1 1 auto;
height: 100%;
}
}

Expand Down
1 change: 1 addition & 0 deletions app/hocs/withThemeData.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ export default function withThemeData() {
const mapSettingsDataToProps = settings => ({
theme: settings ? settings.theme || DEFAULT_THEME : DEFAULT_THEME,
})

return withData(settingsActions, mapSettingsDataToProps)
}
6 changes: 3 additions & 3 deletions app/themes/Dark.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const PANEL = {
'--panel-icon': '#4CFFB3',
'--panel-header': '#1B2029',
'--panel-header-text': '#fff',
'--panel-background': '#2E3542',
'--panel-background': '#333D46',
'--panel-header-border': '#8d98ae',
'--panel-label-text': '#8d98ae',
'--panel-full-height-background': '#2E3542',
Expand All @@ -81,8 +81,8 @@ const MODAL = {
}

const AUTH_STYLES = {
'--auth-main-container-background': '#2E3542',
'--auth-secondary-button-background': '#2E3542',
'--auth-main-container-background': '#333D46',
'--auth-secondary-button-background': '#333D46',
'--auth-scan-qr-border': '#5c677f',
}

Expand Down
Binary file modified build/icon.icns
Binary file not shown.
Binary file modified build/icon.ico
Binary file not shown.
Binary file modified build/icons/512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@
"style-loader": "0.19.0",
"uglifyjs-webpack-plugin": "1.0.1",
"url-loader": "1.1.2",
"webpack": "4.28.3",
"webpack": "4.44.2",
"webpack-cli": "3.2.0",
"webpack-dev-server": "3.1.14"
"webpack-dev-server": "3.11.0"
},
"resolutions": {
"fstream": "^1.0.12",
Expand Down
Loading