Merge branch 'experimental' into travis/rsettings/tab/security
This commit is contained in:
commit
f86e224db6
6 changed files with 498 additions and 54 deletions
|
@ -143,6 +143,7 @@
|
|||
@import "./views/settings/tabs/_GeneralUserSettingsTab.scss";
|
||||
@import "./views/settings/tabs/_HelpSettingsTab.scss";
|
||||
@import "./views/settings/tabs/_PreferencesSettingsTab.scss";
|
||||
@import "./views/settings/tabs/_RolesRoomSettingsTab.scss";
|
||||
@import "./views/settings/tabs/_SecurityRoomSettingsTab.scss";
|
||||
@import "./views/settings/tabs/_SecuritySettingsTab.scss";
|
||||
@import "./views/settings/tabs/_SettingsTab.scss";
|
||||
|
|
24
res/css/views/settings/tabs/_RolesRoomSettingsTab.scss
Normal file
24
res/css/views/settings/tabs/_RolesRoomSettingsTab.scss
Normal file
|
@ -0,0 +1,24 @@
|
|||
/*
|
||||
Copyright 2019 New Vector 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_RolesRoomSettingsTab ul {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.mx_RolesRoomSettingsTab_unbanBtn {
|
||||
margin-right: 10px;
|
||||
margin-bottom: 5px;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue