Merge pull request #550 from vector-im/kegan/archived-rooms

Kegan/archived rooms
This commit is contained in:
Matthew Hodgson 2015-12-21 12:39:48 +00:00
commit 85db381153
3 changed files with 6 additions and 2 deletions

View File

@ -268,7 +268,7 @@ var RoomSubList = React.createClass({
<h2 onClick={ this.onClick } className="mx_RoomSubList_label"> <h2 onClick={ this.onClick } className="mx_RoomSubList_label">
{ this.props.collapsed ? '' : this.props.label } { this.props.collapsed ? '' : this.props.label }
<img className="mx_RoomSubList_chevron" <img className="mx_RoomSubList_chevron"
src={ this.state.hidden ? "img/list-open.svg" : "img/list-close.svg" } src={ this.state.hidden ? "img/list-close.svg" : "img/list-open.svg" }
width="10" height="10" /> width="10" height="10" />
</h2> </h2>
); );

View File

@ -106,6 +106,11 @@ limitations under the License.
padding: 4px; padding: 4px;
} }
.mx_MessageTile_searchHighlight a {
background-color: #76cfa6;
color: #fff;
}
.mx_EventTile_sending { .mx_EventTile_sending {
color: #ddd; color: #ddd;
} }

View File

@ -118,7 +118,6 @@ limitations under the License.
.mx_RoomHeader_searchStatus { .mx_RoomHeader_searchStatus {
display: inline-block; display: inline-block;
font-weight: normal; font-weight: normal;
overflow-y: hidden;
opacity: 0.6; opacity: 0.6;
} }