From e5835d27310d228bbf365a5fd7acca829e6a14c9 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 18 May 2016 15:01:36 +0100 Subject: [PATCH 1/4] typo --- src/components/structures/RoomDirectory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js index d780823099..63b313d793 100644 --- a/src/components/structures/RoomDirectory.js +++ b/src/components/structures/RoomDirectory.js @@ -21,7 +21,7 @@ var React = require('react'); var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg'); var ContentRepo = require("matrix-js-sdk").ContentRepo; var Modal = require('matrix-react-sdk/lib/Modal'); -var sdk = require('matrix-react-sdk') +var sdk = require('matrix-react-sdk'); var dis = require('matrix-react-sdk/lib/dispatcher'); var GeminiScrollbar = require('react-gemini-scrollbar'); From ac24d6707faf5096ad549a9762861b9f9a973f55 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 18 May 2016 15:02:03 +0100 Subject: [PATCH 2/4] Add integs mgt --- src/component-index.js | 1 + .../views/settings/IntegrationsManager.js | 56 +++++++++++++++++++ .../views/settings/IntegrationsManager.css | 20 +++++++ 3 files changed, 77 insertions(+) create mode 100644 src/components/views/settings/IntegrationsManager.js create mode 100644 src/skins/vector/css/matrix-react-sdk/views/settings/IntegrationsManager.css diff --git a/src/component-index.js b/src/component-index.js index b3baf22aed..d7d9c97088 100644 --- a/src/component-index.js +++ b/src/component-index.js @@ -51,4 +51,5 @@ module.exports.components['views.rooms.RoomDNDView'] = require('./components/vie module.exports.components['views.rooms.RoomDropTarget'] = require('./components/views/rooms/RoomDropTarget'); module.exports.components['views.rooms.RoomTooltip'] = require('./components/views/rooms/RoomTooltip'); module.exports.components['views.rooms.SearchBar'] = require('./components/views/rooms/SearchBar'); +module.exports.components['views.settings.IntegrationsManager'] = require('./components/views/settings/IntegrationsManager'); module.exports.components['views.settings.Notifications'] = require('./components/views/settings/Notifications'); diff --git a/src/components/views/settings/IntegrationsManager.js b/src/components/views/settings/IntegrationsManager.js new file mode 100644 index 0000000000..0dffde4b29 --- /dev/null +++ b/src/components/views/settings/IntegrationsManager.js @@ -0,0 +1,56 @@ +/* +Copyright 2015, 2016 OpenMarket Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +'use strict'; + +var React = require('react'); +var sdk = require('matrix-react-sdk'); +var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg'); + +module.exports = React.createClass({ + displayName: 'IntegrationsManager', + + propTypes: { + src: React.PropTypes.string.isRequired, // the source of the integration manager being embedded + onFinished: React.PropTypes.func.isRequired, // callback when the lightbox is dismissed + }, + + // XXX: keyboard shortcuts for managing dialogs should be done by the modal + // dialog base class somehow, surely... + componentDidMount: function() { + document.addEventListener("keydown", this.onKeyDown); + }, + + componentWillUnmount: function() { + document.removeEventListener("keydown", this.onKeyDown); + }, + + onKeyDown: function(ev) { + if (ev.keyCode == 27) { // escape + ev.stopPropagation(); + ev.preventDefault(); + this.props.onFinished(); + } + }, + + render: function() { + return ( +
+ ; +
+ ); + } +}); diff --git a/src/skins/vector/css/matrix-react-sdk/views/settings/IntegrationsManager.css b/src/skins/vector/css/matrix-react-sdk/views/settings/IntegrationsManager.css new file mode 100644 index 0000000000..265231adcb --- /dev/null +++ b/src/skins/vector/css/matrix-react-sdk/views/settings/IntegrationsManager.css @@ -0,0 +1,20 @@ +/* +Copyright 2015, 2016 OpenMarket Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_IntegrationsManager { + width: 640px; + height: 600px; +} From c4d408d095a65f418fb8f616a2db0214d61d2c8e Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 18 May 2016 17:02:39 +0100 Subject: [PATCH 3/4] CSS for IntegrationsManager --- .../views/settings/IntegrationsManager.js | 4 ++-- .../views/settings/IntegrationsManager.css | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/components/views/settings/IntegrationsManager.js b/src/components/views/settings/IntegrationsManager.js index 0dffde4b29..8db010a2b0 100644 --- a/src/components/views/settings/IntegrationsManager.js +++ b/src/components/views/settings/IntegrationsManager.js @@ -48,8 +48,8 @@ module.exports = React.createClass({ render: function() { return ( -
- ; +
+
); } diff --git a/src/skins/vector/css/matrix-react-sdk/views/settings/IntegrationsManager.css b/src/skins/vector/css/matrix-react-sdk/views/settings/IntegrationsManager.css index 265231adcb..0fa40fe1ef 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/settings/IntegrationsManager.css +++ b/src/skins/vector/css/matrix-react-sdk/views/settings/IntegrationsManager.css @@ -15,6 +15,19 @@ limitations under the License. */ .mx_IntegrationsManager { - width: 640px; - height: 600px; + display: -webkit-flex; + display: flex; + width: 100%; + height: 100%; + -webkit-align-items: center; + align-items: center; + justify-content: center; + -webkit-justify-content: center; +} + +.mx_IntegrationsManager iframe { + background-color: #fff; + border: 0px; + width: 720px; + height: 512px; } From a288c5b85d4776d9c7255591d0d2b97a8e39ba42 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 20 May 2016 12:21:45 +0100 Subject: [PATCH 4/4] fix padding of badges --- src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css index 45a997c33a..a8eead8669 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css @@ -103,7 +103,7 @@ limitations under the License. N.B. this has to come after the above _selected width tweaks */ .mx_RoomTile_unreadNotify .mx_RoomTile_name, .mx_RoomTile_highlight .mx_RoomTile_name { - padding-right: 36px; + padding-right: 40px; } .mx_RoomTile_selected .mx_RoomTile_name span {