diff options
author | Martin Ashby <martin@martin-laptop.lan> | 2018-05-18 11:15:19 +0100 |
---|---|---|
committer | Martin Ashby <martin@martin-laptop.lan> | 2018-05-18 11:15:19 +0100 |
commit | ad570aa798fae952b9f996c8681270693fe4da38 (patch) | |
tree | 59a27911d3e8abd4e868a587a29518fc0d2b6f84 /src/Palette.js | |
parent | 042616865221f0eaacfe5105cebdc823f0a4bc2c (diff) | |
download | unicornpaint-ad570aa798fae952b9f996c8681270693fe4da38.tar.gz unicornpaint-ad570aa798fae952b9f996c8681270693fe4da38.tar.bz2 unicornpaint-ad570aa798fae952b9f996c8681270693fe4da38.tar.xz unicornpaint-ad570aa798fae952b9f996c8681270693fe4da38.zip |
Styled everything a bit nicer
Diffstat (limited to 'src/Palette.js')
-rw-r--r-- | src/Palette.js | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/src/Palette.js b/src/Palette.js index ad0ad46..fd4776f 100644 --- a/src/Palette.js +++ b/src/Palette.js @@ -24,21 +24,39 @@ const colorPalette = [ export default class Palette extends Component { render() { let paletteListItems = colorPalette.map((item) => { - var className = "paletteitem" let { r, g, b } = rgb(item) let selected = rgb(this.props.selectedColor) - if (r === selected.r && g === selected.g && b === selected.b) { - className += " selected" - } + let isSelected = r === selected.r && g === selected.g && b === selected.b + + let style = Object.assign({}, + {background: `rgb(${r},${g},${b})`}, + styles.paletteItem, + isSelected && styles.selected + ) + return <div onClick={() => this.props.onSelectColor([r, g, b])} - style={{background: `rgb(${r},${g},${b})`}} - className={className} + style={style} key={r*10000+g*1000+b}/> }) + let list1 = paletteListItems.slice(0, paletteListItems.length / 2) + let list2 = paletteListItems.slice(paletteListItems.length / 2) return ( - <div className="palette"> - {paletteListItems} + <div> + {list1}<br/> + {list2} </div>) } + } + + const styles = { + paletteItem: { + width: "30px", + height: "30px", + border: "3px solid black", + display: "inline-block", + }, + selected: { + border: "3px solid red" + } }
\ No newline at end of file |