Merge branch 'CHedgren-fixes'

Author: ericgio

css/Token.css

@@ -6,11 +6,12 @@
   color: #1f8dd6;
   display: inline-block;
   line-height: 1em;
+  margin: 0 3px 3px 0;
   padding: 4px 7px;
   position: relative;
 }
-.bootstrap-tokenizer .token:focus,
 .bootstrap-tokenizer .token-removeable {
+  cursor: pointer;
   padding-right: 21px;
 }
 .bootstrap-tokenizer .token-selected {
@@ -20,10 +21,6 @@
   text-decoration: none;
 }
 
-.bootstrap-tokenizer .token {
-  margin: 0 3px 3px 0;
-}
-
 .bootstrap-tokenizer .token .close-button {
   bottom: 0;
   padding: 3px 7px;

src/Token.react.js

@@ -40,7 +40,7 @@ const Token = React.createClass({
 
   _renderRemoveableToken() {
     return (
-      <button
+      <div
         className={cx('token', 'token-removeable', {
           'token-selected': this.state.selected,
         }, this.props.className)}
@@ -50,10 +50,13 @@ const Token = React.createClass({
         onKeyDown={this._handleKeyDown}
         tabIndex={0}>
         {this.props.children}
-        <span className="close-button" onClick={this._handleRemove}>
+        <span
+          className="close-button"
+          onClick={this._handleRemove}
+          role="button">
           &times;
         </span>
-      </button>
+      </div>
     );
   },