diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js index 360fd7f0e9..500d6495f7 100644 --- a/src/components/structures/RightPanel.js +++ b/src/components/structures/RightPanel.js @@ -127,12 +127,12 @@ module.exports = React.createClass({ buttonGroup =
- + { membersBadge } { membersHighlight }
- + { filesHighlight } ; diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index f190c584d6..2ed353d226 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -257,8 +257,7 @@ var RoomSubList = React.createClass({ unread={ self.props.activityMap[room.roomId] === 1 } highlight={ self.props.activityMap[room.roomId] === 2 } isInvite={ self.props.label === 'Invites' } - incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } - /> + incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } /> ); }); }, @@ -267,8 +266,8 @@ var RoomSubList = React.createClass({ return (

{ this.props.collapsed ? '' : this.props.label } -

); diff --git a/src/skins/vector/css/vector-web/structures/LeftPanel.css b/src/skins/vector/css/vector-web/structures/LeftPanel.css index 7451d1677f..4f961754f8 100644 --- a/src/skins/vector/css/vector-web/structures/LeftPanel.css +++ b/src/skins/vector/css/vector-web/structures/LeftPanel.css @@ -61,7 +61,7 @@ limitations under the License. -webkit-flex: 0 0 140px; flex: 0 0 140px; - background-color: rgba(118,207,166,0.19); + background-color: rgba(118,207,166,0.2); } .mx_LeftPanel .mx_BottomLeftMenu .mx_RoomTile { diff --git a/src/skins/vector/img/tab.svg b/src/skins/vector/img/tab.svg deleted file mode 100644 index eae92dcf32..0000000000 --- a/src/skins/vector/img/tab.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - icon_eol - Created with bin/sketchtool. - - - - - - - - - - - \ No newline at end of file diff --git a/src/skins/vector/img/upload-original.svg b/src/skins/vector/img/upload-original.svg deleted file mode 100644 index 962fc49d77..0000000000 --- a/src/skins/vector/img/upload-original.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - icons_upload - Created with bin/sketchtool. - - - - - - - - - - - - - - \ No newline at end of file