imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

Browse source
This commit is contained in:
David Baker 2018-10-29 16:20:45 +00:00
commit 8ac62f8c12
81 changed files with 776 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/css/views/context_menus/_TagTileContextMenu.scss
View file

@ -25,6 +25,10 @@ limitations under the License.
line-height: 16px;
}
.mx_TagTileContextMenu_item object {
pointer-events: none;
}
.mx_TagTileContextMenu_item_icon {
padding-right: 8px;

4
res/css/views/dialogs/_DevtoolsDialog.scss
View file

@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_DevTools_dialog {
padding-right: 58px;
}
.mx_DevTools_content {
margin: 10px 0;
}

5
res/css/views/dialogs/_ShareDialog.scss
View file

@ -14,11 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_ShareDialog {
// this is to center the content
padding-right: 58px;
}
.mx_ShareDialog hr {
margin-top: 25px;
margin-bottom: 25px;

5
res/css/views/dialogs/_UnknownDeviceDialog.scss
View file

@ -20,9 +20,6 @@ limitations under the License.
// is a pain in the ass. plus might as well make the dialog big given how
// important it is.
height: 100%;
// position the gemini scrollbar nicely
padding-right: 58px;
}
.mx_UnknownDeviceDialog {
@ -51,4 +48,4 @@ limitations under the License.
.mx_UnknownDeviceDialog .mx_UnknownDeviceDialog_deviceList li {
height: 40px;
border-bottom: 1px solid $primary-hairline-color;
}
}

2
res/css/views/elements/_RoleButton.scss
View file

@ -1,5 +1,5 @@
/*
Copyright 2107 Vector Creations 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.

2
res/css/views/rooms/_RoomList.scss
View file

@ -1,6 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2107 Vector Creations 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.