Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Replace breadcrumbs with recently viewed menu #7073

Merged
merged 98 commits into from
Dec 1, 2021
Merged
Show file tree
Hide file tree
Changes from 92 commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
64d53d5
Move user avatar to Space panel
t3chguy Oct 28, 2021
f86e063
Add room list header for 'Home' or 'Space Name' to room list
t3chguy Oct 28, 2021
f1f32b7
Re-add pending room join spinner
t3chguy Oct 29, 2021
e3424ba
Iterate RoomListHeader plus context menu
t3chguy Oct 29, 2021
37941a5
Iterate space context menu
t3chguy Oct 29, 2021
e4f4e22
Iterate room list + interactions
t3chguy Oct 29, 2021
6b083d6
Move DND to new iA model
t3chguy Oct 29, 2021
1158737
Replace composer custom status management with usermenu one
t3chguy Nov 1, 2021
61b3326
Cull Quick Actions
t3chguy Nov 1, 2021
5d8fecd
Iterate minimized room list state
t3chguy Nov 1, 2021
b1bd780
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 1, 2021
26bcf10
delint
t3chguy Nov 1, 2021
48f2418
Initial implementation of breadcrumb replacement
t3chguy Nov 2, 2021
2edd329
Merge the RoomListNumResults into the RoomListHeader
t3chguy Nov 2, 2021
1e6c56a
Make the search shortcut prompt semi-bold
t3chguy Nov 2, 2021
650bdd2
Iterate RoomListHeader based on design review
t3chguy Nov 2, 2021
5dd370f
Iterate UserMenu based on feedback
t3chguy Nov 3, 2021
8570a20
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 3, 2021
0ba4beb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 3, 2021
d589ec9
Wire up recently viewed entry space names properly
t3chguy Nov 4, 2021
0bff975
Add missing hover style for button and modify context menu position
t3chguy Nov 4, 2021
4a7ccbc
Add hover effect on context menu
t3chguy Nov 4, 2021
391d89d
Make the recently viewed run on hover and move it to the right
t3chguy Nov 5, 2021
9903005
Add name to expanded spacepanel usermenu button
t3chguy Nov 8, 2021
123d804
i18n
t3chguy Nov 8, 2021
bd3de28
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 9, 2021
a09269a
Make room sub list aux button components more generic
t3chguy Nov 9, 2021
e961958
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 9, 2021
2ce6e18
fix tests and remove debug logging
t3chguy Nov 9, 2021
db0864f
Change left panel explore button to only refer to room directory
t3chguy Nov 9, 2021
828337b
Iterate RoomListHeader
t3chguy Nov 9, 2021
4b3bc9b
Fix custom user status input field width in Chrome
t3chguy Nov 9, 2021
95ea95a
Bring back Notification settings button
t3chguy Nov 9, 2021
74cac1f
delint
t3chguy Nov 9, 2021
be4256c
Iterate Recently viewed interactive tooltip based on design
t3chguy Nov 9, 2021
c5059f3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 11, 2021
b573d84
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 11, 2021
f1d263c
i18n
t3chguy Nov 11, 2021
9e87fcb
post-merge fix
t3chguy Nov 11, 2021
f83b9b6
iterate pr
t3chguy Nov 11, 2021
0367103
Remove unused state
t3chguy Nov 11, 2021
d8d7fc5
update copy
t3chguy Nov 11, 2021
58f260a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 11, 2021
ea2d434
Put new breadcrumbs behind labs
t3chguy Nov 11, 2021
5553e37
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 11, 2021
91e83af
Apply suggestions from PR review
t3chguy Nov 15, 2021
d8e5217
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 15, 2021
6b7e6f4
delint
t3chguy Nov 15, 2021
2086525
Update invite iconography
t3chguy Nov 17, 2021
cde0080
Iterate Space context menu to match Figma
t3chguy Nov 17, 2021
1b683d2
Fix chevron alignment
t3chguy Nov 17, 2021
b03e562
Fix edge case for RoomListHeader on metaspaces
t3chguy Nov 17, 2021
223be9e
Wire up general rageshake-driven feedback mechanism
t3chguy Nov 17, 2021
385d8eb
Add IA1.1 info toast
t3chguy Nov 17, 2021
3a3f417
add missing alt attribute
t3chguy Nov 17, 2021
b108c20
delint
t3chguy Nov 17, 2021
53ab409
delint
t3chguy Nov 17, 2021
8e76eb8
tweak ia toast priority
t3chguy Nov 17, 2021
e209852
e2e test account for new toast
t3chguy Nov 17, 2021
eb0c41a
autofocus feedback field and remove old subheading
t3chguy Nov 18, 2021
7550ae9
tweak copy
t3chguy Nov 18, 2021
1289bc1
DRY room context details text
t3chguy Nov 19, 2021
85959d7
test InteractiveTooltip.tsx
t3chguy Nov 19, 2021
6bfeacb
fix tests and behaviour
t3chguy Nov 19, 2021
6879f23
move method into a more appropriate file
t3chguy Nov 19, 2021
a1055ed
Iterate space panel colours to match Figma
t3chguy Nov 22, 2021
c6c9df2
Iterate PR
t3chguy Nov 22, 2021
28d7a40
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 22, 2021
3a9e9b3
delint
t3chguy Nov 22, 2021
24f7cb7
Fix feedback submission with object setting values
t3chguy Nov 23, 2021
58d1abc
tweak scroll bar
t3chguy Nov 23, 2021
b10ef12
Merge branch 't3chguy/fix/19526' of github.com:matrix-org/matrix-reac…
t3chguy Nov 23, 2021
10f0cc3
fix uneven margins in recently viewed ctx menu
t3chguy Nov 23, 2021
b9419ad
delint
t3chguy Nov 23, 2021
4aa54ac
iterate based on review
t3chguy Nov 24, 2021
99c3a11
Tweak colours and update splash image
t3chguy Nov 24, 2021
08653b9
Tweaks based on review
t3chguy Nov 25, 2021
7df1d59
Merge branch 't3chguy/fix/19526' of github.com:matrix-org/matrix-reac…
t3chguy Nov 25, 2021
4f2f0d8
Remove room list prompt, made redundant by the big fat `+`
t3chguy Nov 25, 2021
205769b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 26, 2021
3065850
Fix edge cases around User Menu positioning and dnd
t3chguy Nov 26, 2021
ef0c19f
Add missing import, bad merge?
t3chguy Nov 26, 2021
30b5a84
Update aria label in e2e test
t3chguy Nov 26, 2021
b7dd6f6
Fix room list space rooms context menu explore button behaviour
t3chguy Nov 26, 2021
d20bc45
Tweak copy
t3chguy Nov 26, 2021
c0d89ba
Revert order of options in the UserMenu
t3chguy Nov 26, 2021
99342fe
Tweak copy
t3chguy Nov 29, 2021
ba999e5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 29, 2021
f1f1c16
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 29, 2021
04db477
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 30, 2021
12a1fcf
Merge branch 't3chguy/fix/19526' of github.com:matrix-org/matrix-reac…
t3chguy Nov 30, 2021
dcd6117
Add lab group
t3chguy Nov 30, 2021
e9dde17
i18n
t3chguy Nov 30, 2021
9d699e2
Close Recently viewed interactive tooltip when selecting an item
t3chguy Nov 30, 2021
ba89ed3
Merge branch 't3chguy/fix/19526' of github.com:matrix-org/matrix-reac…
t3chguy Nov 30, 2021
b294d9f
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Nov 30, 2021
2124b21
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Dec 1, 2021
1f183a0
i18n
t3chguy Dec 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions res/css/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,15 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
overflow-y: hidden;
}

.mx_DialogDesignChanges_wrapper .mx_Dialog_fixedWidth {
max-width: 636px; // match splash image width

.mx_AccessibleButton_kind_link {
font-size: inherit;
padding: 0;
}
}

// TODO: Review mx_GeneralButton usage to see if it can use a different class
// These classes were brought in from the old UserSettings and are included here to avoid
// breaking the app.
Expand Down
5 changes: 3 additions & 2 deletions res/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,11 @@
@import "./views/auth/_Welcome.scss";
@import "./views/avatars/_BaseAvatar.scss";
@import "./views/avatars/_DecoratedRoomAvatar.scss";
@import "./views/avatars/_MemberStatusMessageAvatar.scss";
@import "./views/avatars/_WidgetAvatar.scss";
@import "./views/beta/_BetaCard.scss";
@import "./views/context_menus/_CallContextMenu.scss";
@import "./views/context_menus/_IconizedContextMenu.scss";
@import "./views/context_menus/_MessageContextMenu.scss";
@import "./views/context_menus/_StatusMessageContextMenu.scss";
@import "./views/context_menus/_TagTileContextMenu.scss";
@import "./views/dialogs/_AddExistingToSpaceDialog.scss";
@import "./views/dialogs/_AddressPickerDialog.scss";
Expand Down Expand Up @@ -145,6 +143,7 @@
@import "./views/elements/_ImageView.scss";
@import "./views/elements/_InfoTooltip.scss";
@import "./views/elements/_InlineSpinner.scss";
@import "./views/elements/_InteractiveTooltip.scss";
@import "./views/elements/_InviteReason.scss";
@import "./views/elements/_ManageIntegsButton.scss";
@import "./views/elements/_MiniAvatarUploader.scss";
Expand Down Expand Up @@ -232,11 +231,13 @@
@import "./views/rooms/_NotificationBadge.scss";
@import "./views/rooms/_PinnedEventTile.scss";
@import "./views/rooms/_PresenceLabel.scss";
@import "./views/rooms/_RecentlyViewedButton.scss";
@import "./views/rooms/_ReplyPreview.scss";
@import "./views/rooms/_ReplyTile.scss";
@import "./views/rooms/_RoomBreadcrumbs.scss";
@import "./views/rooms/_RoomHeader.scss";
@import "./views/rooms/_RoomList.scss";
@import "./views/rooms/_RoomListHeader.scss";
@import "./views/rooms/_RoomPreviewBar.scss";
@import "./views/rooms/_RoomSublist.scss";
@import "./views/rooms/_RoomTile.scss";
Expand Down
1 change: 1 addition & 0 deletions res/css/structures/_ContextualMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ limitations under the License.
position: absolute;
font-size: $font-14px;
z-index: 5001;
width: max-content;
}

.mx_ContextualMenu_right {
Expand Down
57 changes: 46 additions & 11 deletions res/css/structures/_LeftPanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,40 @@ $roomListCollapsedWidth: 68px;
}

.mx_LeftPanel_filterContainer {
margin-left: 12px;
margin-right: 12px;
margin: 0 12px;
padding: 12px 0 8px;
border-bottom: 1px solid $quinary-content;

flex-shrink: 0; // to convince safari's layout engine the flexbox is fine

// Create a flexbox to organize the inputs
display: flex;
align-items: center;

& + .mx_RoomListHeader {
margin-top: 12px;
}

.mx_RoomSearch_shortcutPrompt {
border-radius: 6px;
background-color: $panel-actions;
padding: 2px 4px;
user-select: none;
pointer-events: none;
font-size: $font-12px;
line-height: $font-15px;
font-weight: $font-semi-bold;
color: $light-fg-color;
margin-right: 6px;
}

.mx_RoomSearch_focused, .mx_RoomSearch_hasQuery {
& + .mx_LeftPanel_exploreButton {
.mx_RoomSearch_shortcutPrompt {
display: none;
}

& + .mx_LeftPanel_exploreButton,
& + .mx_LeftPanel_recentsButton {
// Cheaty way to return the occupied space to the filter input
flex-basis: 0;
margin: 0;
Expand Down Expand Up @@ -144,11 +167,12 @@ $roomListCollapsedWidth: 68px;
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $secondary-content;
background-color: $secondary-content;
}
}

.mx_LeftPanel_exploreButton {
.mx_LeftPanel_exploreButton,
.mx_LeftPanel_recentsButton {
width: 32px;
height: 32px;
border-radius: 8px;
Expand All @@ -163,17 +187,28 @@ $roomListCollapsedWidth: 68px;
left: 8px;
width: 16px;
height: 16px;
mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background: $secondary-content;
background-color: $secondary-content;
}

&.mx_LeftPanel_exploreButton_space::before {
mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
&:hover {
background-color: $tertiary-content;

&::before {
background-color: $background;
}
}
}

.mx_LeftPanel_exploreButton::before {
mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
}

.mx_LeftPanel_recentsButton::before {
mask-image: url('$(res)/img/element-icons/clock.svg');
}
}

.mx_LeftPanel_roomListFilterCount {
Expand Down Expand Up @@ -231,10 +266,10 @@ $roomListCollapsedWidth: 68px;
background-color: transparent;
}

.mx_LeftPanel_exploreButton {
.mx_LeftPanel_exploreButton,
.mx_LeftPanel_recentsButton {
margin-left: 0;
margin-top: 8px;
background-color: transparent;
}
}
}
Expand Down
31 changes: 24 additions & 7 deletions res/css/structures/_RoomSearch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,22 @@ limitations under the License.
.mx_RoomSearch_clearButton {
width: 16px;
height: 16px;
mask-image: url('$(res)/img/element-icons/roomlist/search-clear.svg');
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;
background-color: $secondary-content;
margin-right: 8px;
background-color: $quinary-content;
border-radius: 50%;
position: relative;

&::before {
content: "";
position: absolute;
width: inherit;
height: inherit;
mask-image: url('$(res)/img/feather-customised/x.svg');
mask-position: center;
mask-size: 12px;
mask-repeat: no-repeat;
background-color: $secondary-content;
}
}
}

Expand All @@ -82,13 +92,20 @@ limitations under the License.
}

&.mx_RoomSearch_minimized {
border-radius: 32px;
height: auto;
width: auto;
padding: 8px;
padding: 5px;

.mx_RoomSearch_icon {
margin-left: 0;
}

&:hover {
background-color: $tertiary-content;

.mx_RoomSearch_icon {
background-color: $background;
}
}
}
}
73 changes: 46 additions & 27 deletions res/css/structures/_SpacePanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $gutterSize: 16px;
$activeBorderTransparentGap: 1px;

$activeBackgroundColor: $panel-actions;
$activeBorderColor: $secondary-content;
$activeBorderColor: $primary-content;

.mx_SpacePanel {
background-color: $groupFilterPanel-bg-color;
Expand All @@ -37,7 +37,7 @@ $activeBorderColor: $secondary-content;

.mx_SpacePanel_spaceTreeWrapper {
flex: 1;
padding: 8px 8px 16px 0;
padding: 12px 8px 16px 0;
}

.mx_SpacePanel_toggleCollapse {
Expand Down Expand Up @@ -92,13 +92,6 @@ $activeBorderColor: $secondary-content;
}
}

.mx_SpaceTreeLevel {
display: flex;
flex-direction: column;
max-width: 250px;
flex-grow: 1;
}

.mx_SpaceItem {
display: inline-flex;
flex-flow: wrap;
Expand Down Expand Up @@ -209,10 +202,10 @@ $activeBorderColor: $secondary-content;
&.mx_SpaceButton_people,
&.mx_SpaceButton_orphans {
.mx_SpaceButton_icon {
background-color: #ffffff;
background-color: $panel-actions;

&::before {
background-color: #3f3d3d;
background-color: $secondary-content;
}
}
}
Expand All @@ -234,8 +227,6 @@ $activeBorderColor: $secondary-content;
}

&.mx_SpaceButton_new .mx_SpaceButton_icon {
background-color: $panel-actions;

&::before {
background-color: $primary-content;
mask-image: url('$(res)/img/element-icons/plus.svg');
Expand All @@ -261,7 +252,7 @@ $activeBorderColor: $secondary-content;
position: relative;

&::before {
top: 2px;
top: 3px;
left: 2px;
content: '';
width: 16px;
Expand All @@ -276,6 +267,35 @@ $activeBorderColor: $secondary-content;
}
}

.mx_SpaceTreeLevel {
display: flex;
flex-direction: column;
max-width: 250px;
flex-grow: 1;

.mx_BaseAvatar:not(.mx_UserMenu_userAvatar_BaseAvatar) .mx_BaseAvatar_initial {
color: $secondary-content;
width: 32px;
height: 32px;
border-radius: 8px;
background-color: $panel-actions;
font-size: $font-15px !important; // override inline style
font-weight: $font-semi-bold;
line-height: $font-18px;

& + .mx_BaseAvatar_image {
visibility: hidden;
}
}

.mx_SpaceTreeLevel {
.mx_BaseAvatar_initial {
width: 24px;
height: 24px;
}
}
}

.mx_SpaceButton_avatarWrapper {
position: relative;
}
Expand Down Expand Up @@ -338,13 +358,8 @@ $activeBorderColor: $secondary-content;
line-height: $font-18px;
}

.mx_IconizedContextMenu_optionList .mx_AccessibleButton.mx_SpacePanel_contextMenu_inviteButton {
color: $accent;

.mx_SpacePanel_iconInvite::before {
background-color: $accent;
mask-image: url('$(res)/img/element-icons/room/invite.svg');
}
.mx_SpacePanel_iconInvite::before {
mask-image: url('$(res)/img/element-icons/room/invite.svg');
}

.mx_SpacePanel_iconSettings::before {
Expand All @@ -360,15 +375,11 @@ $activeBorderColor: $secondary-content;
}

.mx_SpacePanel_iconPlus::before {
mask-image: url('$(res)/img/element-icons/roomlist/plus-circle.svg');
}

.mx_SpacePanel_iconHash::before {
mask-image: url('$(res)/img/element-icons/roomlist/hash-circle.svg');
mask-image: url('$(res)/img/element-icons/plus.svg');
}

.mx_SpacePanel_iconExplore::before {
mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
mask-image: url('$(res)/img/element-icons/roomlist/search.svg');
}

.mx_SpacePanel_noIcon {
Expand All @@ -378,6 +389,14 @@ $activeBorderColor: $secondary-content;
padding-left: 5px !important; // override default iconized label style to align with header
}
}

.mx_SpacePanel_contextMenu_separatorLabel {
color: $tertiary-content;
font-size: $font-10px;
line-height: $font-12px;
font-weight: $font-semi-bold;
//margin-left: 8px;
}
}

.mx_SpacePanel_sharePublicSpace {
Expand Down
5 changes: 5 additions & 0 deletions res/css/structures/_ToastContainer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ limitations under the License.
background-color: $primary-content;
}

&.mx_Toast_icon_labs::after {
mask-image: url('$(res)/img/element-icons/flask.svg');
background-color: $secondary-content;
}

.mx_Toast_title, .mx_Toast_body {
grid-column: 2;
}
Expand Down
Loading