Skip to content

Commit

Permalink
Tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
casesandberg committed Aug 14, 2015
1 parent fa92129 commit 134f22c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/components/chrome/ChromeFields.jsx
Expand Up @@ -12,7 +12,7 @@ class ChromeFields extends ReactCSS.Component {
super();

this.state = {
view: 'hex',
view: '',
};

this.handleChange = this.handleChange.bind(this);
Expand Down Expand Up @@ -92,7 +92,7 @@ class ChromeFields extends ReactCSS.Component {
}

componentDidMount() {
if (this.props.a === 100 && this.state.view !== 'hex') {
if (this.props.a === 1 && this.state.view !== 'hex') {
this.setState({ view: 'hex' });
} else if (this.state.view !== 'rgb' && this.state.view !== 'hsl') {
this.setState({ view: 'rgb' });
Expand All @@ -105,7 +105,7 @@ class ChromeFields extends ReactCSS.Component {
} else if (this.state.view === 'rgb') {
this.setState({ view: 'hsl' });
} else if (this.state.view === 'hsl') {
if (this.props.a === 100) {
if (this.props.a === 1) {
this.setState({ view: 'hex' });
} else {
this.setState({ view: 'rgb' });
Expand Down
1 change: 1 addition & 0 deletions src/components/slider/SliderSwatch.jsx
Expand Up @@ -17,6 +17,7 @@ class SliderSwatch extends ReactCSS.Component {
swatch: {
height: '12px',
background: 'hsl(' + this.props.h + ', 50%, ' + (this.props.offset * 100) + '%)',
cursor: 'pointer',
},
},
'first': {
Expand Down

0 comments on commit 134f22c

Please sign in to comment.