gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3227 from vector-im/dbkr/add_unban_button 

CSS for un-ban button in RoomSettings
This commit is contained in:
Richard van der Hoff 2017-02-17 12:46:13 +00:00 committed by GitHub
parent f2654616eb 8224d7fc60
commit 75097471b6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
View File

@ -1,5 +1,6 @@
/* /*
Copyright 2015, 2016 OpenMarket Ltd Copyright 2015, 2016 OpenMarket Ltd
Copyright 2017 Vector Creations Ltd
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -20,6 +21,7 @@ limitations under the License.
} }
.mx_RoomSettings_leaveButton, .mx_RoomSettings_leaveButton,
.mx_RoomSettings_unbanButton,
.mx_RoomSettings_integrationsButton, .mx_RoomSettings_integrationsButton,
.mx_RoomSettings_integrationsButton_error { .mx_RoomSettings_integrationsButton_error {
position: relative; position: relative;
@ -30,11 +32,15 @@ limitations under the License.
color: $accent-fg-color; color: $accent-fg-color;
line-height: 34px; line-height: 34px;
text-align: center; text-align: center;
float: right;
cursor: pointer; cursor: pointer;
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
} }
.mx_RoomSettings_leaveButton,
.mx_RoomSettings_integrationsButton,
.mx_RoomSettings_integrationsButton_error {
float: right;
}
.mx_RoomSettings_integrationsButton_error { .mx_RoomSettings_integrationsButton_error {
pointer: not-allowed; pointer: not-allowed;
} }
@ -50,6 +56,9 @@ limitations under the License.
background-color: $accent-color; background-color: $accent-color;
color: $accent-fg-color; color: $accent-fg-color;
} }
.mx_RoomSettings_unbanButton {
display: inline;
}
.mx_RoomSettings_e2eIcon { .mx_RoomSettings_e2eIcon {
padding-left: 4px; padding-left: 4px;
@ -227,4 +236,4 @@ limitations under the License.
padding: 6px; padding: 6px;
padding-left: 1em; padding-left: 1em;
padding-right: 1em; padding-right: 1em;
} }