Skip to content
This repository has been archived by the owner on May 14, 2019. It is now read-only.

Commit

Permalink
Added icons back in, replacing webpack url-loader with file-loader
Browse files Browse the repository at this point in the history
  • Loading branch information
joecritch committed Aug 26, 2014
1 parent 10bcf1a commit c033336
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/js/components/Detail.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var Detail = React.createClass({
</div>
</div>
}
{notes.length &&
{notes && notes.length &&
<div className="BoxSet-item">
<div className="Box c-contrast">
<div className="t-label">More detail</div>
Expand Down
20 changes: 10 additions & 10 deletions src/js/components/Result.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ var SelectionActions = require('../actions/SelectionActions');
var ResultActions = require('../actions/ResultActions');
var cx = require('react/lib/cx');

var addIcon = require('url?limit=0&mimetype=image/svg+xml!../../img/add.svg');
var acceptIcon = require('url?limit=0&mimetype=image/svg+xml!../../img/accept.svg');
// var addIcon = require('url?limit=0&mimetype=image/svg+xml!../../img/add.svg');
// var acceptIcon = require('url?limit=0&mimetype=image/svg+xml!../../img/accept.svg');
var addIcon = require('file!../../img/add.svg');
var acceptIcon = require('file!../../img/accept.svg');

var Result = React.createClass({
propTypes: {
Expand All @@ -30,17 +32,15 @@ var Result = React.createClass({
},
render: function() {
var root = React.DOM['div'];

// <div className="Ring-inner">
// <img src={addIcon} alt="Add" className="u-stretch" />
// </div>
// <div className="Ring-inner">
// <img src={acceptIcon} alt="Remove" className="u-stretch" />
// </div>

return (
<root onClick={this._onClick} className={cx({Result: true, Box: true, 'is-selected': this.props.current, 'c-selectable': true, 'is-added': this.props.added, 'u-contain': true})}>
<div onClick={this._onToggleBtnClick} className={cx({'Result-icon': true, 'Ring': true, 'is-moved': this.props.added, 't-label': true, 'c-added': this.props.added})}>
<div className="Ring-inner">
<img src={addIcon} alt="Add" className="u-stretch" />
</div>
<div className="Ring-inner">
<img src={acceptIcon} alt="Remove" className="u-stretch" />
</div>
</div>
<div className="t-heading u-textTruncate">{this.props.result.name}</div>
</root>
Expand Down

0 comments on commit c033336

Please sign in to comment.