From 66e36e9d4010e669fbf307721d56d19e54bd2646 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 23 Mar 2016 15:15:38 +0000 Subject: [PATCH 1/3] CSS for https://github.com/matrix-org/matrix-react-sdk/pull/247 --- .../matrix-react-sdk/views/rooms/MessageComposer.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css index b21f1e97f..8631d7749 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css @@ -37,6 +37,16 @@ limitations under the License. display: block; } +.mx_MessageComposer_noperm_error { + display: table-cell; + width: 100%; + vertical-align: middle; + height: 70px; + text-align: center; + font-style: italic; + color: #888; +} + .mx_MessageComposer_input { display: table-cell; width: 100%; From cfcb050822454a0cd4eee8b6a80de4e05cd61104 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 23 Mar 2016 15:21:37 +0000 Subject: [PATCH 2/3] Add composer controls wrapper to set correct width on the composer controls wrapper div --- config.json | 4 ++-- .../css/matrix-react-sdk/views/rooms/MessageComposer.css | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 923d23ab2..0c51ab012 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,4 @@ { - "default_hs_url": "https://matrix.org", - "default_is_url": "https://vector.im" + "default_hs_url": "http://localhost:8008", + "default_is_url": "http://localhost:8090" } diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css index 8631d7749..9ed5f1cb3 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css @@ -37,6 +37,10 @@ limitations under the License. display: block; } +.mx_MessageComposer_composecontrols { + width: 100%; +} + .mx_MessageComposer_noperm_error { display: table-cell; width: 100%; From 8764b44325793c2f873d6f42d02ea9e338c128fa Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 23 Mar 2016 16:41:17 +0000 Subject: [PATCH 3/3] Un-commit config change --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 0c51ab012..923d23ab2 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,4 @@ { - "default_hs_url": "http://localhost:8008", - "default_is_url": "http://localhost:8090" + "default_hs_url": "https://matrix.org", + "default_is_url": "https://vector.im" }