From 38c0d624782c6dd9625b7fd46e5ec1e45553171f Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 19 Sep 2017 10:46:00 +0100
Subject: [PATCH 1/2] Fix typo for integs error button error

---
 .../vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
index 517ff94c1..87befcfab 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
@@ -42,7 +42,7 @@ limitations under the License.
     float: right;
 }
 .mx_RoomSettings_integrationsButton_error {
-    pointer: not-allowed;
+    cursor: not-allowed;
 }
 .mx_RoomSettings_integrationsButton_errorPopup {
     position: absolute;

From d25c3be6274c642336f3e7dcefc7751392777c40 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 19 Sep 2017 11:59:51 +0100
Subject: [PATCH 2/2] CSS to fix ugly integrations button

See matrix-org/matrix-react-sdk#1399
---
 .../views/rooms/_RoomSettings.scss            | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
index 87befcfab..9e269ac2b 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
@@ -21,9 +21,7 @@ limitations under the License.
 }
 
 .mx_RoomSettings_leaveButton,
-.mx_RoomSettings_unbanButton,
-.mx_RoomSettings_integrationsButton,
-.mx_RoomSettings_integrationsButton_error {
+.mx_RoomSettings_unbanButton {
     position: relative;
     height: 36px;
     background-color: $accent-color;
@@ -36,25 +34,37 @@ limitations under the License.
     padding-left: 12px;
     padding-right: 12px;
 }
+.mx_RoomSettings_integrationsButton_error {
+    position: relative;
+    cursor: not-allowed;
+}
+.mx_RoomSettings_integrationsButton_error img {
+    position: absolute;
+    right: -5px;
+    top: -5px;
+}
 .mx_RoomSettings_leaveButton,
-.mx_RoomSettings_integrationsButton,
 .mx_RoomSettings_integrationsButton_error {
     float: right;
 }
-.mx_RoomSettings_integrationsButton_error {
-    cursor: not-allowed;
+.mx_RoomSettings_integrationsButton_error .mx_RoomSettings_integrationsButton_errorPopup {
+    display: none;
+}
+.mx_RoomSettings_integrationsButton_error:hover .mx_RoomSettings_integrationsButton_errorPopup {
+    display: inline;
 }
 .mx_RoomSettings_integrationsButton_errorPopup {
     position: absolute;
     top: 110%;
-    left: -26%;
-    width: 150%;
+    left: -125%;
+    width: 348%;
     padding: 2%;
     font-size: 10pt;
     line-height: 1.5em;
     border-radius: 5px;
     background-color: $accent-color;
     color: $accent-fg-color;
+    text-align: center;
 }
 .mx_RoomSettings_unbanButton {
     display: inline;