lib/carte/client/views/card.cjsx in carte-server-0.0.4 vs lib/carte/client/views/card.cjsx in carte-server-0.0.5

- old
+ new

@@ -4,10 +4,11 @@ ModalTrigger = require('react-bootstrap/lib/ModalTrigger') markdownIt = require('markdown-it')(linkify: true) module.exports = React.createClass displayName: 'Card' + isSafariOrUiWebView: /(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent) componentDidMount: -> @props.card.on 'change', @forceUpdate.bind(@, null) @props.card.on 'change', (model)-> console.log 'change', model @@ -25,26 +26,21 @@ onMouseLeave: ()-> @setState showTools: false render: -> console.log 'Card: render' - style = {height:'220px'} - if @props.card.get('focused') - #style.color = 'red' - style.borderColor = '#ccc' - <div className='col-sm-4' style={padding:'5px'} onMouseOver={@onMouseOver} onMouseLeave={@onMouseLeave}> - <div className='list-group' style={margin:'0px',padding:'0px'}> - <div className='list-group-item' style={style}> + <div className='col-sm-4 col-xs-12 list-group' style={marginBottom:'0px',padding:"5px"} onMouseOver={@onMouseOver} onMouseLeave={@onMouseLeave}> + <div className='list-group-item' style={height:'220px'}> <div> { if @props.card.get('focused') <i className='glyphicon glyphicon-star' style={marginRight:'5px'} /> } <strong> {@props.card.get('title')} </strong> - <span className='pull-right' style={{visibility: if @state.showTools then 'visible' else 'hidden'}}> + <span className='pull-right tools' style={{visibility: if @isSafariOrUiWebView || @state.showTools then 'visible' else 'hidden'}}> <ModalTrigger modal={<Edit card={@props.card} />}> <a href="javascript:void(0)"> <i className='glyphicon glyphicon-edit' /> </a> </ModalTrigger> @@ -53,13 +49,10 @@ <a href={'#/' + @props.card.get('title')}> <i className='glyphicon glyphicon-link' /> </a> </span> </div> - <div style={overflow:'scroll',width:'100%',height:'80%',wordWrap:'break-word'}> - <p> - <div dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content')} /> - </p> + <div style={overflow:'hidden',width:'100%',height:'80%',wordWrap:'break-word'}> + <p dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content')} /> </div> - </div> </div> </div>