mirror of
https://github.com/vector-im/element-call.git
synced 2026-08-29 21:15:19 +00:00
Merge pull request #4100 from element-hq/remove-stopgap-styles
Stop using colors from previous design system
This commit is contained in:
@@ -5,10 +5,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
|||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.endCall > svg {
|
|
||||||
color: var(--stopgap-color-on-solid-accent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rotate > svg {
|
.rotate > svg {
|
||||||
animation: spin 1s linear infinite;
|
animation: spin 1s linear infinite;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -135,21 +135,12 @@ interface EndCallButtonProps extends ComponentPropsWithoutRef<"button"> {
|
|||||||
size?: "md" | "lg";
|
size?: "md" | "lg";
|
||||||
}
|
}
|
||||||
|
|
||||||
export const EndCallButton: FC<EndCallButtonProps> = ({
|
export const EndCallButton: FC<EndCallButtonProps> = (props) => {
|
||||||
className,
|
|
||||||
...props
|
|
||||||
}) => {
|
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Tooltip label={t("hangup_button_label")}>
|
<Tooltip label={t("hangup_button_label")}>
|
||||||
<CpdButton
|
<CpdButton iconOnly Icon={EndCallIcon} destructive {...props} />
|
||||||
className={classNames(className, styles.endCall)}
|
|
||||||
iconOnly
|
|
||||||
Icon={EndCallIcon}
|
|
||||||
destructive
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -28,12 +28,6 @@ layer(compound);
|
|||||||
--font-size-title: calc(24px * var(--font-scale));
|
--font-size-title: calc(24px * var(--font-scale));
|
||||||
--font-size-headline: calc(32px * var(--font-scale));
|
--font-size-headline: calc(32px * var(--font-scale));
|
||||||
|
|
||||||
/* These colors are needed during the transitionary period between the old and
|
|
||||||
new Compound design systems, but should be removed ASAP */
|
|
||||||
--stopgap-color-on-solid-accent: var(--cpd-color-bg-canvas-default);
|
|
||||||
--stopgap-background-85: rgba(255, 255, 255, 0.85);
|
|
||||||
--stopgap-bgColor3: #444;
|
|
||||||
|
|
||||||
--cpd-color-border-accent: var(--cpd-color-green-800);
|
--cpd-color-border-accent: var(--cpd-color-green-800);
|
||||||
/* The distance to inset non-full-width content from the edge of the window
|
/* The distance to inset non-full-width content from the edge of the window
|
||||||
along the inline axis. This ramps up from 16px for typical mobile windows, to
|
along the inline axis. This ramps up from 16px for typical mobile windows, to
|
||||||
|
|||||||
@@ -173,14 +173,6 @@ Please see LICENSE in the repository root for full details.
|
|||||||
border-color: var(--cpd-color-border-disabled);
|
border-color: var(--cpd-color-border-disabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
.checkbox svg {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkbox svg * {
|
|
||||||
stroke: var(--stopgap-color-on-solid-accent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkboxField input[type="checkbox"]:checked + label > .checkbox {
|
.checkboxField input[type="checkbox"]:checked + label > .checkbox {
|
||||||
background: var(--cpd-color-text-action-accent);
|
background: var(--cpd-color-text-action-accent);
|
||||||
border-color: var(--cpd-color-text-action-accent);
|
border-color: var(--cpd-color-text-action-accent);
|
||||||
|
|||||||
@@ -405,7 +405,7 @@ exports[`InCallView > rendering > renders 1`] = `
|
|||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
aria-labelledby="_r_14_"
|
aria-labelledby="_r_14_"
|
||||||
class="_button_1nw83_8 _endCall_204dcb _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
|
class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
|
||||||
data-kind="primary"
|
data-kind="primary"
|
||||||
data-size="lg"
|
data-size="lg"
|
||||||
data-testid="incall_leave"
|
data-testid="incall_leave"
|
||||||
|
|||||||
@@ -205,7 +205,7 @@ exports[`LobbyView > renders with AppBar android 1`] = `
|
|||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
aria-labelledby="_r_40_"
|
aria-labelledby="_r_40_"
|
||||||
class="_button_1nw83_8 _endCall_204dcb _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
|
class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
|
||||||
data-kind="primary"
|
data-kind="primary"
|
||||||
data-size="lg"
|
data-size="lg"
|
||||||
data-testid="incall_leave"
|
data-testid="incall_leave"
|
||||||
@@ -436,7 +436,7 @@ exports[`LobbyView > renders with AppBar ios 1`] = `
|
|||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
aria-labelledby="_r_54_"
|
aria-labelledby="_r_54_"
|
||||||
class="_button_1nw83_8 _endCall_204dcb _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
|
class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
|
||||||
data-kind="primary"
|
data-kind="primary"
|
||||||
data-size="lg"
|
data-size="lg"
|
||||||
data-testid="incall_leave"
|
data-testid="incall_leave"
|
||||||
@@ -817,7 +817,7 @@ exports[`LobbyView > renders with header and participant count 1`] = `
|
|||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
aria-labelledby="_r_q_"
|
aria-labelledby="_r_q_"
|
||||||
class="_button_1nw83_8 _endCall_204dcb _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
|
class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
|
||||||
data-kind="primary"
|
data-kind="primary"
|
||||||
data-size="lg"
|
data-size="lg"
|
||||||
data-testid="incall_leave"
|
data-testid="incall_leave"
|
||||||
|
|||||||
Reference in New Issue
Block a user