From 5ecf5606751ca50ad6f65c4ad679ac727587a5f4 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 14 Feb 2017 17:56:42 +0000 Subject: [PATCH 1/3] CSS for un-ban button in RoomSettings --- .../views/rooms/_RoomSettings.scss | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 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 ef115f6e..1d0b8236 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 @@ -20,6 +20,7 @@ limitations under the License. } .mx_RoomSettings_leaveButton, +.mx_RoomSettings_unbanButton, .mx_RoomSettings_integrationsButton, .mx_RoomSettings_integrationsButton_error { position: relative; @@ -30,11 +31,15 @@ limitations under the License. color: $accent-fg-color; line-height: 34px; text-align: center; - float: right; cursor: pointer; padding-left: 12px; padding-right: 12px; } +.mx_RoomSettings_leaveButton, +.mx_RoomSettings_integrationsButton, +.mx_RoomSettings_integrationsButton_error { + float: right; +} .mx_RoomSettings_integrationsButton_error { pointer: not-allowed; } @@ -50,6 +55,9 @@ limitations under the License. background-color: $accent-color; color: $accent-fg-color; } +.mx_RoomSettings_unbanButton { + display: inline; +} .mx_RoomSettings_e2eIcon { padding-left: 4px; @@ -227,4 +235,7 @@ limitations under the License. padding: 6px; padding-left: 1em; padding-right: 1em; -} \ No newline at end of file +} + +.mx_RoomSettings_unban_button { +} From f1f54c95abf00498264a68c8e9c33c2c44e99b28 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 14 Feb 2017 18:11:36 +0000 Subject: [PATCH 2/3] Copyright --- .../vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss | 1 + 1 file changed, 1 insertion(+) 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 1d0b8236..20dee9fb 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 @@ -1,5 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd +Copyright 2017 Vector Creations Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 8224d7fc6062568f1d26cee659fbec7d24d6979a Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 16 Feb 2017 15:14:53 +0000 Subject: [PATCH 3/3] Oops - remove empty CSS selector --- .../vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss | 3 --- 1 file changed, 3 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 20dee9fb..517ff94c 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 @@ -237,6 +237,3 @@ limitations under the License. padding-left: 1em; padding-right: 1em; } - -.mx_RoomSettings_unban_button { -}