gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sort out files button & NPE

This commit is contained in:
Matthew Hodgson 2015-10-24 20:56:27 +01:00
parent f4d21f883a
commit 0cffd8dd84
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/skins/vector/css/organisms/RightPanel.css
View File

@ -43,22 +43,22 @@ limitations under the License.
margin-top: 32px; margin-top: 32px;
float: left; float: left;
background-color: #fff; background-color: #fff;
margin-left: 3px; margin-left: -4px;
} }
.mx_RightPanel_headerButton { .mx_RightPanel_headerButton {
cursor: pointer; cursor: pointer;
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
padding-left: 8px; padding-left: 15px;
padding-right: 8px; padding-right: 15px;
position: relative; position: relative;
} }
.mx_RightPanel_headerButton_highlight { .mx_RightPanel_headerButton_highlight {
position: relative; position: absolute;
bottom: 0px; bottom: -2px;
left: -4px; left: 10px;
width: 25px; width: 25px;
height: 4px; height: 4px;
background-color: #76cfa6; background-color: #76cfa6;

4
src/skins/vector/views/organisms/RightPanel.js
View File

@ -66,7 +66,7 @@ module.exports = React.createClass({
} }
var membersBadge; var membersBadge;
if (this.state.phase == this.Phase.MemberList) { if (this.state.phase == this.Phase.MemberList && this.props.roomId) {
var cli = MatrixClientPeg.get(); var cli = MatrixClientPeg.get();
var room = cli.getRoom(this.props.roomId); var room = cli.getRoom(this.props.roomId);
// FIXME: presumably we need to subscribe to some event to refresh this count when it changes? // FIXME: presumably we need to subscribe to some event to refresh this count when it changes?
@ -82,7 +82,7 @@ module.exports = React.createClass({
{ membersHighlight } { membersHighlight }
</div> </div>
<div className="mx_RightPanel_headerButton mx_RightPanel_filebutton"> <div className="mx_RightPanel_headerButton mx_RightPanel_filebutton">
<img src="img/file.png" width="17" height="22" title="Files" alt="Files"/> <img src="img/files.png" width="17" height="22" title="Files" alt="Files"/>
{ filesHighlight } { filesHighlight }
</div> </div>
</div>; </div>;