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

Replace home icon with new one #7571

Merged
merged 2 commits into from
Jan 18, 2022
Merged

Replace home icon with new one #7571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68eed3f
Replace home icon with new one
t3chguy Jan 18, 2022
cd0f104
Iterate space context menu
t3chguy Jan 18, 2022
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
6 changes: 5 additions & 1 deletion res/css/structures/_SpacePanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,10 @@ $activeBorderColor: $primary-content;
line-height: $font-18px;
}

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

.mx_SpacePanel_iconInvite::before {
mask-image: url('$(res)/img/element-icons/room/invite.svg');
}
Expand All @@ -393,7 +397,7 @@ $activeBorderColor: $primary-content;
}

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

.mx_SpacePanel_iconPreferences::before {
Expand Down
2 changes: 1 addition & 1 deletion res/css/structures/_UserMenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ limitations under the License.
}

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

.mx_UserMenu_iconDnd::before {
Expand Down
4 changes: 2 additions & 2 deletions res/img/element-icons/home.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions res/img/element-icons/roomlist/home.svg
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion src/components/views/context_menus/SpaceContextMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ const SpaceContextMenu = ({ space, hideHeader, onFinished, ...props }: IProps) =

const canAddRooms = space.currentState.maySendStateEvent(EventType.SpaceChild, userId);

let newRoomSection;
let newRoomSection: JSX.Element;
if (space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
const onNewRoomClick = (ev: ButtonEvent) => {
ev.preventDefault();
Expand Down Expand Up @@ -194,6 +194,11 @@ const SpaceContextMenu = ({ space, hideHeader, onFinished, ...props }: IProps) =
{ space.name }
</div> }
<IconizedContextMenuOptionList first>
<IconizedContextMenuOption
iconClassName="mx_SpacePanel_iconHome"
label={_t("Space home")}
onClick={onExploreRoomsClick}
/>
{ inviteOption }
<IconizedContextMenuOption
iconClassName="mx_SpacePanel_iconExplore"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2888,6 +2888,7 @@
"Mentions only": "Mentions only",
"See room timeline (devtools)": "See room timeline (devtools)",
"Room": "Room",
"Space home": "Space home",
"Manage & explore rooms": "Manage & explore rooms",
"Move up": "Move up",
"Move down": "Move down",
Expand Down