Replace more icons with compound (#31378)
* Replace element-icons/room/composer/attach.svg with compound Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Replace element-icons/room/*/emoji.svg with compound Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Replace element-icons/room/message-bar/edit.svg with compound Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Replace element-icons/room/composer/poll.svg with compound Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Replace element-icons/room/composer/plain_text.svg with compound Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Remove unused star.svg Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Replace element-icons/upload.svg with compound Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Replace element-icons/settings/preference.svg with compound Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Replace element-icons/settings/flask.svg with compound Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Replace element-icons/settings/appearance.svg with compound Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update snapshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update screenshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
committed by
GitHub
parent
f00b643774
commit
7ca4c8bd7f
@@ -9,8 +9,8 @@ Please see LICENSE files in the repository root for full details.
|
||||
import React, { useEffect, useState, useContext, type JSX } from "react";
|
||||
import { MatrixEvent, M_TEXT } from "matrix-js-sdk/src/matrix";
|
||||
import { logger } from "matrix-js-sdk/src/logger";
|
||||
import { PollsEndIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
|
||||
|
||||
import { Icon as PollIcon } from "../../../../res/img/element-icons/room/composer/poll.svg";
|
||||
import MatrixClientContext, { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
|
||||
import { _t } from "../../../languageHandler";
|
||||
import { textForEvent } from "../../../TextForEvent";
|
||||
@@ -93,7 +93,7 @@ export const MPollEndBody = ({ mxEvent, ref, ...props }: IBodyProps): JSX.Elemen
|
||||
const pollEndFallbackMessage = M_TEXT.findIn<string>(mxEvent.getContent()) || textForEvent(mxEvent, cli);
|
||||
return (
|
||||
<>
|
||||
<PollIcon className="mx_MPollEndBody_icon" />
|
||||
<PollsEndIcon className="mx_MPollEndBody_icon" />
|
||||
{!isLoadingPollStartEvent && pollEndFallbackMessage}
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -30,10 +30,10 @@ import {
|
||||
DeleteIcon,
|
||||
RestartIcon,
|
||||
ThreadsIcon,
|
||||
EditIcon,
|
||||
ReactionAddIcon,
|
||||
} from "@vector-im/compound-design-tokens/assets/web/icons";
|
||||
|
||||
import { Icon as EditIcon } from "../../../../res/img/element-icons/room/message-bar/edit.svg";
|
||||
import { Icon as EmojiIcon } from "../../../../res/img/element-icons/room/message-bar/emoji.svg";
|
||||
import { Icon as ExpandMessageIcon } from "../../../../res/img/element-icons/expand-message.svg";
|
||||
import { Icon as CollapseMessageIcon } from "../../../../res/img/element-icons/collapse-message.svg";
|
||||
import { _t } from "../../../languageHandler";
|
||||
@@ -190,7 +190,7 @@ const ReactButton: React.FC<IReactButtonProps> = ({ mxEvent, reactions, onFocusC
|
||||
tabIndex={isActive ? 0 : -1}
|
||||
placement="left"
|
||||
>
|
||||
<EmojiIcon />
|
||||
<ReactionAddIcon />
|
||||
</ContextMenuTooltipButton>
|
||||
|
||||
{contextMenu}
|
||||
|
||||
@@ -10,8 +10,8 @@ import React from "react";
|
||||
import { type PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
|
||||
import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
|
||||
import { Tooltip } from "@vector-im/compound-web";
|
||||
import { PollsIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
|
||||
|
||||
import { Icon as PollIcon } from "../../../../../res/img/element-icons/room/composer/poll.svg";
|
||||
import { formatLocalDateShort } from "../../../../DateUtils";
|
||||
import { _t } from "../../../../languageHandler";
|
||||
|
||||
@@ -31,7 +31,7 @@ export const PollListItem: React.FC<Props> = ({ event, onClick }) => {
|
||||
<Tooltip label={_t("right_panel|poll|view_poll")} placement="top" isTriggerInteractive={false}>
|
||||
<div className="mx_PollListItem_content">
|
||||
<span>{formattedDate}</span>
|
||||
<PollIcon className="mx_PollListItem_icon" />
|
||||
<PollsIcon className="mx_PollListItem_icon" />
|
||||
<span className="mx_PollListItem_question">{pollEvent.question.text}</span>
|
||||
</div>
|
||||
</Tooltip>
|
||||
|
||||
@@ -10,8 +10,8 @@ import React, { useEffect, useState } from "react";
|
||||
import { type PollAnswerSubevent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
|
||||
import { type MatrixEvent, type Poll, PollEvent, type Relations } from "matrix-js-sdk/src/matrix";
|
||||
import { Tooltip } from "@vector-im/compound-web";
|
||||
import { PollsEndIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
|
||||
|
||||
import { Icon as PollIcon } from "../../../../../res/img/element-icons/room/composer/poll.svg";
|
||||
import { _t } from "../../../../languageHandler";
|
||||
import { formatLocalDateShort } from "../../../../DateUtils";
|
||||
import { allVotes, collectUserVotes, countVotes } from "../../messages/MPollBody";
|
||||
@@ -94,7 +94,7 @@ export const PollListItemEnded: React.FC<Props> = ({ event, poll, onClick }) =>
|
||||
<Tooltip label={_t("right_panel|poll|view_poll")} placement="top" isTriggerInteractive={false}>
|
||||
<div className="mx_PollListItemEnded_content">
|
||||
<div className="mx_PollListItemEnded_title">
|
||||
<PollIcon className="mx_PollListItemEnded_icon" />
|
||||
<PollsEndIcon className="mx_PollListItemEnded_icon" />
|
||||
<span className="mx_PollListItemEnded_question">{pollEvent.question.text}</span>
|
||||
<Caption>{formattedDate}</Caption>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user