Commit bc963c26 authored by Sonja Happ's avatar Sonja Happ
Browse files

upstream merge from develop, align fix for href warnings

parents 9b682307 4f8231e0
......@@ -85,8 +85,8 @@ class EditableHeader extends React.Component {
<FormControl type='text' bsSize='large' value={this.state.title} onChange={this.onChange} style={editStyle} autoFocus />
</form>
<Button onClick={this.save}><Icon icon='check' style={iconStyle} /></Button>
<Button onClick={this.cancel}><Icon icon='times' style={iconStyle} /></Button>
<Button bsStyle="link" onClick={this.save}><Icon icon='check' style={iconStyle} /></Button>
<Button bsStyle="link" onClick={this.cancel}><Icon icon='times' style={iconStyle} /></Button>
</div>;
}
......@@ -95,7 +95,7 @@ class EditableHeader extends React.Component {
{this.state.title}
</h1>
<Button onClick={this.edit}><Icon icon='edit' style={iconStyle} /></Button>
<Button bsStyle="link" onClick={this.edit}><Icon icon='edit' style={iconStyle} /></Button>
</div>;
}
}
......
......@@ -74,7 +74,7 @@ class CustomTable extends Component {
if (linkKey && data[linkKey] != null) {
cell.push(<Link to={child.props.link + data[linkKey]}>{content}</Link>);
} else if (child.props.clickable) {
cell.push(<Button onClick={() => child.props.onClick(index)}>{content}</Button>);
cell.push(<Button bsStyle="link" onClick={() => child.props.onClick(index)}>{content}</Button>);
} else {
cell.push(content);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment