From b830f433718abfe14b9ffdabbdf6081e1810559a Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 20 Jan 2016 16:59:53 +0000 Subject: [PATCH] remove RoomAvatar; stale border-radius; fix aliases table --- .../structures/UserSettings.css | 4 --- .../views/avatars/RoomAvatar.css | 28 ------------------- .../views/rooms/RoomSettings.css | 2 +- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 src/skins/vector/css/matrix-react-sdk/views/avatars/RoomAvatar.css diff --git a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css index aa253c1ade..40bb134fde 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css @@ -156,10 +156,6 @@ limitations under the License. cursor: pointer; } -.mx_UserSettings_avatarPicker .mx_RoomAvatar { - border-radius: 40px; -} - .mx_UserSettings_avatarPicker_edit { text-align: center; margin-top: 10px; diff --git a/src/skins/vector/css/matrix-react-sdk/views/avatars/RoomAvatar.css b/src/skins/vector/css/matrix-react-sdk/views/avatars/RoomAvatar.css deleted file mode 100644 index 29b9cefb92..0000000000 --- a/src/skins/vector/css/matrix-react-sdk/views/avatars/RoomAvatar.css +++ /dev/null @@ -1,28 +0,0 @@ -/* -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_RoomAvatar { - vertical-align: middle; -} - -.mx_RoomAvatar_initial { - position: absolute; - color: #fff; - text-align: center; - font-weight: normal ! important; - speak: none; - pointer-events: none; -} \ No newline at end of file diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index c58c344115..006882ebb5 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -105,7 +105,7 @@ limitations under the License. .mx_RoomSettings .mx_RoomSettings_aliasesTable { margin-top: 12px; - margin-bottom: -16px; + margin-bottom: 0px; margin-left: 56px; display: table; }