aboutsummaryrefslogtreecommitdiff
path: root/src/Palette.js
diff options
context:
space:
mode:
authorMartin Ashby <martin@ashbysoft.com>2018-07-03 12:38:22 +0100
committerMartin Ashby <martin@ashbysoft.com>2018-07-03 12:38:22 +0100
commit3dc7e2a2e2158c99cb44d1ea3a3a6ff8738255d2 (patch)
tree65b6718e2fdc12034af02339c8b7742ea1cde15f /src/Palette.js
parent4a353d95f6d2dd8a9841bdae6f0721f5b014599e (diff)
downloadunicornpaint-3dc7e2a2e2158c99cb44d1ea3a3a6ff8738255d2.tar.gz
unicornpaint-3dc7e2a2e2158c99cb44d1ea3a3a6ff8738255d2.tar.bz2
unicornpaint-3dc7e2a2e2158c99cb44d1ea3a3a6ff8738255d2.tar.xz
unicornpaint-3dc7e2a2e2158c99cb44d1ea3a3a6ff8738255d2.zip
Better layout with CSS.
Changed favicon & title.
Diffstat (limited to 'src/Palette.js')
-rw-r--r--src/Palette.js32
1 files changed, 7 insertions, 25 deletions
diff --git a/src/Palette.js b/src/Palette.js
index fd4776f..9ffd19b 100644
--- a/src/Palette.js
+++ b/src/Palette.js
@@ -28,35 +28,17 @@ const colorPalette = [
let selected = rgb(this.props.selectedColor)
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
- )
+ let className = isSelected ? "paletteItem selected" : "paletteItem"
return <div
- onClick={() => this.props.onSelectColor([r, g, b])}
- style={style}
- key={r*10000+g*1000+b}/>
+ key={r*10000+g*1000+b}
+ className={className}
+ style={{background: `rgb(${r},${g},${b})`}}
+ onClick={() => this.props.onSelectColor([r, g, b])}/>
})
- let list1 = paletteListItems.slice(0, paletteListItems.length / 2)
- let list2 = paletteListItems.slice(paletteListItems.length / 2)
return (
- <div>
- {list1}<br/>
- {list2}
+ <div className="palette">
+ {paletteListItems}
</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