From 4b733e4a157b2c081385bbd3951af4c0e10601de Mon Sep 17 00:00:00 2001 From: John Lyon-Smith Date: Wed, 28 Feb 2018 11:31:49 -0800 Subject: [PATCH] Rename tone to color --- website/src/App.js | 2 +- website/src/Modal/MessageModal.js | 2 +- website/src/ui/BoundInput.js | 2 +- website/src/ui/Text.js | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/website/src/App.js b/website/src/App.js index f79549e..8bd6e5d 100644 --- a/website/src/App.js +++ b/website/src/App.js @@ -51,7 +51,7 @@ export class App extends React.Component { - {'v' + versionInfo.version} {versionInfo.copyright} + {'v' + versionInfo.version} {versionInfo.copyright} diff --git a/website/src/Modal/MessageModal.js b/website/src/Modal/MessageModal.js index 9169e8d..dc184e0 100644 --- a/website/src/Modal/MessageModal.js +++ b/website/src/Modal/MessageModal.js @@ -28,7 +28,7 @@ export class MessageModal extends React.Component { {message} - {detail} + {detail} diff --git a/website/src/ui/BoundInput.js b/website/src/ui/BoundInput.js index 152fc34..bfd25d6 100644 --- a/website/src/ui/BoundInput.js +++ b/website/src/ui/BoundInput.js @@ -50,7 +50,7 @@ export default class BoundInput extends React.Component { onChange={this.handleChange} placeholder={placeholder} />
- {valid ? ' ' : message} + {valid ? ' ' : message} ) } diff --git a/website/src/ui/Text.js b/website/src/ui/Text.js index 5f174d7..fc380d2 100644 --- a/website/src/ui/Text.js +++ b/website/src/ui/Text.js @@ -8,14 +8,14 @@ class Text extends Component { size: PropTypes.string, margin: PropTypes.number, children: PropTypes.node, - tone: PropTypes.string, + color: PropTypes.oneOf(['normal', 'alert', 'dimmed']), width: PropTypes.oneOfType([ PropTypes.string, PropTypes.number ]), align: PropTypes.string, } static defaultProps = { size: 'medium', - tone: 'normal', + color: 'normal', margin: 0, align: 'left', } @@ -28,7 +28,7 @@ class Text extends Component { display: 'inline-block', fontSize: fontInfo.size[this.props.size], fontFamily: fontInfo.family, - color: fontInfo.color[this.props.tone], + color: fontInfo.color[this.props.color], textAlign: align, margin, width,