+
- { membersBadge ? membersBadge : }
+
+
-
+
+
+
;
}
@@ -276,4 +261,3 @@ module.exports = React.createClass({
);
}
});
-
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index e87f3f8a33..af8500df77 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -26,6 +26,7 @@ var Unread = require('matrix-react-sdk/lib/Unread');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var RoomNotifs = require('matrix-react-sdk/lib/RoomNotifs');
var FormattingUtils = require('matrix-react-sdk/lib/utils/FormattingUtils');
+var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
// turn this on for drop & drag console debugging galore
var debug = false;
@@ -417,15 +418,17 @@ var RoomSubList = React.createClass({
}
}
+ var tabindex = this.props.searchFilter === "" ? "0" : "-1";
+
return (
+
-
);
},
@@ -447,11 +450,11 @@ var RoomSubList = React.createClass({
});
return (
-
+
{ this.props.collapsed ? '' : this.props.label }
+
{ roomCount }
{ badge }
{ incomingCall }
-
+
+ more
- { content }
- { content }
+
);
},
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 7fc5100049..12bfc6dd6f 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -20,6 +20,7 @@ var React = require('react');
var sdk = require('matrix-react-sdk')
var dis = require('matrix-react-sdk/lib/dispatcher');
var rate_limited_func = require('matrix-react-sdk/lib/ratelimitedfunc');
+var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
module.exports = React.createClass({
displayName: 'SearchBox',
@@ -35,6 +36,25 @@ module.exports = React.createClass({
};
},
+ componentDidMount: function() {
+ this.dispatcherRef = dis.register(this.onAction);
+ },
+
+ componentWillUnmount: function() {
+ dis.unregister(this.dispatcherRef);
+ },
+
+ onAction: function(payload) {
+ switch (payload.action) {
+ // Clear up the text field when a room is selected.
+ case 'view_room':
+ if (this.refs.search) {
+ this._clearSearch();
+ }
+ break;
+ }
+ },
+
onChange: function() {
if (!this.refs.search) return;
this.setState({ searchTerm: this.refs.search.value });
@@ -61,35 +81,42 @@ module.exports = React.createClass({
}
},
+ _clearSearch: function() {
+ this.refs.search.value = "";
+ this.onChange();
+ },
+
render: function() {
var TintableSvg = sdk.getComponent('elements.TintableSvg');
+ var collapseTabIndex = this.refs.search && this.refs.search.value !== "" ? "-1" : "0";
+
var toggleCollapse;
if (this.props.collapsed) {
toggleCollapse =
-
-
+
-
+ { this.refs.search.value = ""; this.onChange(); } }>
+ { this._clearSearch(); } }>
+
:
;
name = instance.desc;
span_class = 'mx_NetworkDropdown_menu_network';
}
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index c47fecfed6..4a0c1663be 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -22,6 +22,7 @@ var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var DateUtils = require('matrix-react-sdk/lib/DateUtils');
var filesize = require('filesize');
+var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
module.exports = React.createClass({
displayName: 'ImageView',
@@ -162,7 +163,7 @@ module.exports = React.createClass({
- 
+
+
diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
index a22e15ffc1..dbe4196aad 100644
--- a/src/components/views/globals/MatrixToolbar.js
+++ b/src/components/views/globals/MatrixToolbar.js
@@ -19,6 +19,7 @@ limitations under the License.
var React = require('react');
var Notifier = require("matrix-react-sdk/lib/Notifier");
var sdk = require('matrix-react-sdk')
+var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
module.exports = React.createClass({
displayName: 'MatrixToolbar',
@@ -38,7 +39,7 @@ module.exports = React.createClass({
+
);
}
diff --git a/src/components/views/rooms/SearchBar.js b/src/components/views/rooms/SearchBar.js
index 99e7706416..1653f269a8 100644
--- a/src/components/views/rooms/SearchBar.js
+++ b/src/components/views/rooms/SearchBar.js
@@ -20,6 +20,7 @@ var React = require('react');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var sdk = require('matrix-react-sdk');
var classNames = require('classnames');
+var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
module.exports = React.createClass({
displayName: 'SearchBar',
@@ -57,12 +58,12 @@ module.exports = React.createClass({
var allRoomsClasses = classNames({ mx_SearchBar_button : true, mx_SearchBar_unselected : this.state.scope !== 'All' });
return (
-
You are not receiving desktop notifications. Enable them now
-
+
- 
-
+ This Room
+ All Rooms
+
);
}
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
index 55771f7945..37c68ad9e6 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
@@ -107,6 +107,16 @@ limitations under the License.
justify-content: flex-start;
}
+.mx_RoomView_empty {
+ flex: 1 1 auto;
+ font-size: 13px;
+ padding-left: 3em;
+ padding-right: 3em;
+ margin-right: 20px;
+ margin-top: 33%;
+ text-align: center;
+}
+
.mx_RoomView_MessageList {
width: 100%;
list-style-type: none;
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
index 39c65e5d18..a359627af3 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
@@ -46,7 +46,7 @@ limitations under the License.
}
.mx_Login_logo img {
- height: 100%
+ max-height: 100%
}
.mx_Login_support {
diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss
index 579e385249..804b3f419e 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss
@@ -54,7 +54,7 @@ limitations under the License.
margin-right: 8px;
padding-left: 0.5em;
padding-right: 0.5em;
- width: 70px;
+ width: 85px;
outline: none;
cursor: pointer;
color: $accent-color;
diff --git a/src/skins/vector/css/vector-web/structures/_RightPanel.scss b/src/skins/vector/css/vector-web/structures/_RightPanel.scss
index 91034e633d..c0872e82d7 100644
--- a/src/skins/vector/css/vector-web/structures/_RightPanel.scss
+++ b/src/skins/vector/css/vector-web/structures/_RightPanel.scss
@@ -34,14 +34,15 @@ limitations under the License.
.mx_RightPanel_headerButtonGroup {
margin-top: 6px;
- float: left;
+ display: flex;
+ width: 100%;
background-color: $primary-bg-color;
margin-left: 0px;
}
.mx_RightPanel_headerButton {
cursor: pointer;
- display: table-cell;
+ flex: 0;
vertical-align: top;
padding-left: 4px;
padding-right: 5px;
@@ -69,6 +70,12 @@ limitations under the License.
padding-bottom: 2px;
}
+.mx_RightPanel_collapsebutton {
+ flex: 1;
+ text-align: right;
+ margin-top: 20px;
+}
+
.mx_RightPanel .mx_MemberList,
.mx_RightPanel .mx_MemberInfo,
.mx_RightPanel_blank {
diff --git a/src/skins/vector/img/icons-close.svg b/src/skins/vector/img/icons-close.svg
index 6feb660aff..453b51082f 100644
--- a/src/skins/vector/img/icons-close.svg
+++ b/src/skins/vector/img/icons-close.svg
@@ -3,7 +3,7 @@
This Room
- All Rooms
-
+