Merge pull request #493 from asaadmahmoodspin/master

MM-1899 - Updating UI for commands in input box
Этот коммит содержится в:
Christopher Speller
2015-08-31 09:03:47 -04:00
родитель 3cdd0192dd 2b55ffb026
Коммит 8867e2fe22
2 изменённых файлов: 16 добавлений и 6 удалений

Просмотреть файл

@@ -48,15 +48,15 @@ module.exports = React.createClass({
if (this.state.suggestions[i].suggestion != this.state.cmd) {
suggestions.push(
<div key={i} className="command-name" onClick={this.handleClick.bind(this, i)}>
<div className="pull-left"><strong>{ this.state.suggestions[i].suggestion }</strong></div>
<div className="command-desc pull-right">{ this.state.suggestions[i].description }</div>
<div className="command__title"><strong>{ this.state.suggestions[i].suggestion }</strong></div>
<div className="command__desc">{ this.state.suggestions[i].description }</div>
</div>
);
}
}
return (
<div ref="mentionlist" className="command-box" style={{height:(this.state.suggestions.length*37)+2}}>
<div ref="mentionlist" className="command-box" style={{height:(this.state.suggestions.length*56)+2}}>
{ suggestions }
</div>
);

Просмотреть файл

@@ -4,20 +4,30 @@
width: 100%;
border: $border-gray;
bottom: 38px;
overflow: auto;
@extend %popover-box-shadow;
.sidebar--right & {
bottom: 100px;
}
}
.command-name {
position: relative;
width: 100%;
background-color: #fff;
height: 37px;
line-height: 37px;
padding: 2px 10px 2px 5px;
line-height: 24px;
padding: 5px 10px 8px;
z-index: 101;
font-size: 0.95em;
border-bottom: 1px solid #ddd;
&:hover {
background-color: #e8eaed;
}
.command__desc {
margin-left: 5px;
color: #999;
line-height: normal;
}
}
.command-desc {