Refactor and redesign user menu (#32812)
* Initial quick settings menu * Total refactor * Quick design fixes. * Refactor to use a view model. * Remove unused strings * Apply label * Refactor naming * Fixup most tests * Remove specific theming for old user menu * prettier * Lots of cleanup * Allow overriding the menu classes * update snap * Oops translations * tidy * Cleanup guest flows. * Copyrights * Remove unused classname * Match guest view to designs * Add guest screenshots * Update guests * snapshot * Cleanup * fix import * Update tests * More sceenshot fixes * update collapsed * move statements to prevent flake * update snap * Kick it along * Click the room list * Fiddle with the room video list. * More screenshot adjustments * fix imports * fix another import * Update snaps * update snaps * Fix snap flakes * Refactor to move actions to view component, and callbacks to Actions * Cleanup * Cleanup * Cleanup * invert auth * More bits * fix * Change md buttons to sm * Try to assemble the snapshot component of the house of cards * Consistent newlines between tests * Update snapshot Not sure why this was like this, this seems consistet for a logged in user * Update snapshot again these seem sensible for a guest * Remove test I don't really understand why the thing it asserts matters, so I'm removing it for now. * Update snapshot * screenshot * Don't show profile picture for guests I'm not really sure what it meant for this interface to have a property with a default value, so I've removed it and added the property to the view model. * Show avatar in story * update snapshots for showAvatar * Update screenshots & hopefully make hover consistent in one * Use outline home icon --------- Co-authored-by: David Baker <dbkr@users.noreply.github.com>
This commit is contained in:
Will Hunt
David Baker
@@ -339,26 +339,6 @@ Please see LICENSE files in the repository root for full details.
|
||||
mask-repeat: no-repeat;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_UserMenu {
|
||||
padding-bottom: 12px;
|
||||
border-bottom: 1px solid $separator;
|
||||
margin: 12px 14px 4px 18px;
|
||||
width: min-content;
|
||||
max-width: 226px;
|
||||
|
||||
/* Display the container and img here as block elements so they don't take
|
||||
* up extra vertical space.
|
||||
*/
|
||||
.mx_UserMenu_userAvatar_BaseAvatar {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
&.newUi .mx_UserMenu {
|
||||
margin-top: var(--cpd-space-4x);
|
||||
border-bottom: none;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_SpacePanel_contextMenu {
|
||||
|
||||
@@ -1,126 +0,0 @@
|
||||
/*
|
||||
Copyright 2024 New Vector Ltd.
|
||||
Copyright 2020 The Matrix.org Foundation C.I.C.
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
|
||||
Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
.mx_UserMenu {
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.mx_AccessibleButton {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.mx_UserMenu_userAvatar {
|
||||
position: relative;
|
||||
|
||||
.mx_BaseAvatar {
|
||||
pointer-events: none; /* makes the avatar non-draggable */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.mx_UserMenu_contextMenuButton {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mx_UserMenu_name {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
font-weight: var(--cpd-font-weight-semibold);
|
||||
font-size: $font-15px;
|
||||
line-height: $font-24px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_IconizedContextMenu {
|
||||
&.mx_UserMenu_contextMenu {
|
||||
width: 258px;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_UserMenu_contextMenu {
|
||||
&.mx_IconizedContextMenu .mx_IconizedContextMenu_optionList_red {
|
||||
.mx_AccessibleButton {
|
||||
padding-top: 16px;
|
||||
padding-bottom: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.mx_UserMenu_contextMenu_header {
|
||||
padding: 20px;
|
||||
|
||||
/* Create a flexbox to organize the header a bit easier */
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.mx_UserMenu_contextMenu_name {
|
||||
/* Create another flexbox of columns to handle large user IDs */
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: calc(100% - 40px); /* 40px = 32px theme button + 8px margin to theme button */
|
||||
|
||||
.mx_UserMenu_contextMenu_displayName,
|
||||
.mx_UserMenu_contextMenu_userId {
|
||||
font: var(--cpd-font-body-lg-regular);
|
||||
|
||||
/* Automatically grow subelements to fit the container */
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
|
||||
/* Ellipsize text overflow */
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.mx_UserMenu_contextMenu_displayName {
|
||||
font-weight: var(--cpd-font-weight-semibold);
|
||||
}
|
||||
}
|
||||
|
||||
.mx_UserMenu_contextMenu_themeButton {
|
||||
flex-shrink: 0;
|
||||
margin-left: 8px;
|
||||
|
||||
/* to make alignment easier, create flexbox for the image */
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
/* For enhanced visibility under contrast control */
|
||||
outline: 1px solid transparent;
|
||||
|
||||
/* Compound overrides to match transitional designs */
|
||||
padding: var(--cpd-space-2x);
|
||||
svg {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
&.mx_UserMenu_contextMenu_guestPrompts {
|
||||
padding-top: 0;
|
||||
display: inline-block;
|
||||
|
||||
> span {
|
||||
font-weight: var(--cpd-font-weight-semibold);
|
||||
display: block;
|
||||
|
||||
& + span {
|
||||
margin-top: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.mx_IconizedContextMenu_icon svg {
|
||||
color: $icon-button-color;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user