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/hold_ui

Browse source
This commit is contained in:
David Baker 2020-12-01 15:09:25 +00:00
commit 31044b68d1
31 changed files with 692 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

20
res/css/structures/_UserMenu.scss
View file

@ -231,9 +231,29 @@ limitations under the License.
justify-content: center;
}
&.mx_UserMenu_contextMenu_guestPrompts,
&.mx_UserMenu_contextMenu_hostingLink {
padding-top: 0;
}
&.mx_UserMenu_contextMenu_guestPrompts {
display: inline-block;
> span {
font-weight: 600;
display: block;
& + span {
margin-top: 8px;
}
}
.mx_AccessibleButton_kind_link {
font-weight: normal;
font-size: inherit;
padding: 0;
}
}
}
.mx_IconizedContextMenu_icon {

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

@ -22,7 +22,7 @@
iframe {
// Sticker picker depends on the fixed height previously used for all tiles
height: 273px;
height: 283px; // height of the popout minus the AppTile menu bar
}
}