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

Commit a0e3421

Browse files
committed
Iterate space panel expand s'more
1 parent 2b92efe commit a0e3421

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

res/css/structures/_SpacePanel.scss

+6-1
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,16 @@ $activeBorderColor: $primary-content;
7070

7171
&.expanded {
7272
margin-left: auto;
73-
margin-right: -12px; // overflow into .mx_UserMenu's margin without butchering its bottom stroke
73+
margin-right: -8px; // overflow into .mx_UserMenu's margin without butchering its bottom stroke
74+
border-radius: 8px;
7475

7576
&::before {
7677
transform: rotate(90deg);
7778
}
79+
80+
&:hover {
81+
background-color: $panel-actions;
82+
}
7883
}
7984
}
8085

src/components/views/spaces/SpacePanel.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -322,16 +322,15 @@ const SpacePanel = () => {
322322
<AccessibleTooltipButton
323323
className={classNames("mx_SpacePanel_toggleCollapse", { expanded: !isPanelCollapsed })}
324324
onClick={() => setPanelCollapsed(!isPanelCollapsed)}
325-
title={isPanelCollapsed ? _t("Open sidebar") : _t("Close sidebar")}
325+
title={isPanelCollapsed ? _t("Expand") : _t("Collapse")}
326326
tooltip={<div>
327327
<div className="mx_Tooltip_title">
328-
{ isPanelCollapsed ? _t("Open sidebar") : _t("Close sidebar") }
328+
{ isPanelCollapsed ? _t("Expand") : _t("Collapse") }
329329
</div>
330330
<div className="mx_Tooltip_sub">
331331
{ isMac ? "⌘ + ⇧ + D" : "Ctrl + Shift + D" }
332332
</div>
333333
</div>}
334-
forceHide={isPanelCollapsed}
335334
/>
336335
</UserMenu>
337336
<Droppable droppableId="top-level-spaces">

src/i18n/strings/en_EN.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -1100,8 +1100,8 @@
11001100
"Create": "Create",
11011101
"Show all rooms": "Show all rooms",
11021102
"Options": "Options",
1103-
"Open sidebar": "Open sidebar",
1104-
"Close sidebar": "Close sidebar",
1103+
"Expand": "Expand",
1104+
"Collapse": "Collapse",
11051105
"Click to copy": "Click to copy",
11061106
"Copied!": "Copied!",
11071107
"Failed to copy": "Failed to copy",
@@ -1129,8 +1129,6 @@
11291129
"Recommended for public spaces.": "Recommended for public spaces.",
11301130
"Jump to first unread room.": "Jump to first unread room.",
11311131
"Jump to first invite.": "Jump to first invite.",
1132-
"Expand": "Expand",
1133-
"Collapse": "Collapse",
11341132
"Space options": "Space options",
11351133
"Remove": "Remove",
11361134
"This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",

0 commit comments

Comments
 (0)