Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move decorator help link to bottom #2666

Merged
merged 5 commits into from Aug 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -89,10 +89,10 @@ const DecoratorSidebar = React.createClass({
);
return (
<div>
<AddDecoratorButton stream={this.props.stream} nextOrder={nextDecoratorOrder}/>
<OverlayTrigger trigger="click" rootClose placement="right" overlay={popoverHelp}>
<Button bsStyle="link" className={DecoratorStyles.helpLink}>What are message decorators? <i className="fa fa-question-circle" /></Button>
<Button bsStyle="link" className={DecoratorStyles.helpLink}>What are message decorators?</Button>
</OverlayTrigger>
<AddDecoratorButton stream={this.props.stream} nextOrder={nextDecoratorOrder}/>
<div ref="decoratorsContainer" className={DecoratorStyles.decoratorListContainer} style={{ maxHeight: this.state.maxDecoratorsHeight }}>
<SortableList items={decoratorItems} onMoveItem={this._updateOrder} />
</div>
Expand Down
Expand Up @@ -12,7 +12,8 @@
}

:local(.addDecoratorButtonContainer) {
margin-bottom: 10px;
margin-top: 5px;
margin-bottom: 5px;
}

:local(.addDecoratorSelect) {
Expand All @@ -22,8 +23,9 @@

:local(.helpLink) {
font-size: 12px;
padding-left: 0;
padding-right: 0;
padding-top: 0px;
padding-right: 0px;
float: right;
}

:local(.helpPopover) {
Expand All @@ -47,5 +49,6 @@

:local(.decoratorListContainer) {
overflow-y: scroll;
display: inline;
padding-bottom: 20px;
}