matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-04 11:51:45 +03:00
Code Activity

Move silence button

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-07-24 20:39:44 +02:00
parent 064544369a
commit 396fd2d012
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/css/views/toasts/_IncomingCallToast.scss
View File

@@ -29,7 +29,6 @@ limitations under the License.
background-color: $voipcall-plinth-color; // To match mx_Toast background-color: $voipcall-plinth-color; // To match mx_Toast
pointer-events: initial; // restore pointer events so the user can accept/decline pointer-events: initial; // restore pointer events so the user can accept/decline
cursor: pointer;
.mx_IncomingCallToast_content { .mx_IncomingCallToast_content {
display: flex; display: flex;
@@ -119,17 +118,18 @@ limitations under the License.
} }
} }
} }
}
.mx_IncomingCallToast_iconButton { .mx_IncomingCallToast_iconButton {
display: flex; display: flex;
position: absolute; height: 20px;
right: 8px; width: 20px;
&::before { &::before {
content: ''; content: '';
height: 20px; height: inherit;
width: 20px; width: inherit;
background-color: $tertiary-fg-color; background-color: $tertiary-fg-color;
mask-repeat: no-repeat; mask-repeat: no-repeat;
mask-size: contain; mask-size: contain;
@@ -144,5 +144,4 @@ limitations under the License.
.mx_IncomingCallToast_unSilence::before { .mx_IncomingCallToast_unSilence::before {
mask-image: url('$(res)/img/voip/un-silence.svg'); mask-image: url('$(res)/img/voip/un-silence.svg');
} }
}
} }

10
src/toasts/IncomingCallToast.tsx
View File

@@ -113,11 +113,6 @@ export default class IncomingCallToast extends React.Component<IProps, IState> {
<div className="mx_CallEvent_type_icon" /> <div className="mx_CallEvent_type_icon" />
{ isVoice ? _t("Voice call") : _t("Video call") } { isVoice ? _t("Voice call") : _t("Video call") }
</div> </div>
<AccessibleTooltipButton
className={silenceClass}
onClick={this.onSilenceClick}
title={this.state.silenced ? _t("Sound on") : _t("Silence call")}
/>
<div className="mx_IncomingCallToast_buttons"> <div className="mx_IncomingCallToast_buttons">
<AccessibleButton <AccessibleButton
className="mx_IncomingCallToast_button mx_IncomingCallToast_button_decline" className="mx_IncomingCallToast_button mx_IncomingCallToast_button_decline"
@@ -135,6 +130,11 @@ export default class IncomingCallToast extends React.Component<IProps, IState> {
</AccessibleButton> </AccessibleButton>
</div> </div>
</div> </div>
<AccessibleTooltipButton
className={silenceClass}
onClick={this.onSilenceClick}
title={this.state.silenced ? _t("Sound on") : _t("Silence call")}
/>
</React.Fragment>; </React.Fragment>;
} }
} }