Merge pull request #45 from smeijer/patch-1

allow style overrides from user
nolan/hinaloe-test
Etienne Lemay 2017-02-17 06:40:40 -08:00 committed by GitHub
commit a957fe196e
1 changed files with 1 additions and 1 deletions

View File

@ -265,7 +265,7 @@ export default class Picker extends React.Component {
{ skin } = this.state,
width = (perLine * (emojiSize + 12)) + 12 + 2
return <div style={{...style, width: width}} className='emoji-mart'>
return <div style={{width: width, ...style}} className='emoji-mart'>
<div className='emoji-mart-bar'>
<Anchors
ref='anchors'