Merged in fix/phone-icon (pull request #3465)
fix/SW-3695-icons * fix/SW-3695-icons
This commit is contained in:
@@ -93,11 +93,7 @@ export default async function IntroSection({
|
|||||||
>
|
>
|
||||||
<div className={styles.phoneNumber}>
|
<div className={styles.phoneNumber}>
|
||||||
<TextLink href={`tel:${phoneNumber}`} typography="Link/sm">
|
<TextLink href={`tel:${phoneNumber}`} typography="Link/sm">
|
||||||
<MaterialIcon
|
<MaterialIcon icon="call" color="CurrentColor" size={20} />
|
||||||
icon="phone_enabled"
|
|
||||||
color="CurrentColor"
|
|
||||||
size={20}
|
|
||||||
/>
|
|
||||||
{phoneNumber}
|
{phoneNumber}
|
||||||
</TextLink>
|
</TextLink>
|
||||||
<LocalCallCharges
|
<LocalCallCharges
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ export default async function Profile() {
|
|||||||
value: user.dateOfBirth,
|
value: user.dateOfBirth,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
icon: "phone_enabled",
|
icon: "call",
|
||||||
label: intl.formatMessage({
|
label: intl.formatMessage({
|
||||||
id: "common.phoneNumber",
|
id: "common.phoneNumber",
|
||||||
defaultMessage: "Phone number",
|
defaultMessage: "Phone number",
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ export default async function ContactRow({ contact }: ContactRowProps) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function PhoneIcon(props: MaterialIconSetIconProps) {
|
function PhoneIcon(props: MaterialIconSetIconProps) {
|
||||||
return <MaterialIcon icon="phone_enabled" {...props} />
|
return <MaterialIcon icon="call" {...props} />
|
||||||
}
|
}
|
||||||
function MailIcon(props: MaterialIconSetIconProps) {
|
function MailIcon(props: MaterialIconSetIconProps) {
|
||||||
return <MaterialIcon icon="mail" {...props} />
|
return <MaterialIcon icon="mail" {...props} />
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
.link {
|
.link {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: var(--Space-x05);
|
gap: var(--Space-x05);
|
||||||
align-items: center;
|
align-items: baseline;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bookingCodeFilter {
|
.bookingCodeFilter {
|
||||||
|
|||||||
@@ -611,7 +611,7 @@ function InputShowcase() {
|
|||||||
<FormInput
|
<FormInput
|
||||||
name="clearLeftRight"
|
name="clearLeftRight"
|
||||||
label="Clear with Left Icon"
|
label="Clear with Left Icon"
|
||||||
leftIcon={<MaterialIcon icon="phone_enabled" />}
|
leftIcon={<MaterialIcon icon="call" />}
|
||||||
showClearContentIcon
|
showClearContentIcon
|
||||||
/>
|
/>
|
||||||
<FormInput
|
<FormInput
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ const MaterialIconMappings: {
|
|||||||
{ icon: "local_parking", name: "parking" },
|
{ icon: "local_parking", name: "parking" },
|
||||||
{ icon: "local_parking", name: "parkingfreeparking" },
|
{ icon: "local_parking", name: "parkingfreeparking" },
|
||||||
{ icon: "pets", name: "petfriendlyrooms" },
|
{ icon: "pets", name: "petfriendlyrooms" },
|
||||||
{ icon: "phone_enabled", name: "directdialphoneandvoicemail" },
|
{ icon: "call", name: "directdialphoneandvoicemail" },
|
||||||
{ icon: "restaurant", name: "restaurant" },
|
{ icon: "restaurant", name: "restaurant" },
|
||||||
{ icon: "room_service", name: "roomservice" },
|
{ icon: "room_service", name: "roomservice" },
|
||||||
{ icon: "sauna", name: "sauna" },
|
{ icon: "sauna", name: "sauna" },
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ export function IconByIconName({
|
|||||||
return <MaterialIcon icon="photo_camera" {...props} />
|
return <MaterialIcon icon="photo_camera" {...props} />
|
||||||
case IconName.Cellphone:
|
case IconName.Cellphone:
|
||||||
case IconName.Phone:
|
case IconName.Phone:
|
||||||
return <MaterialIcon icon="phone_enabled" {...props} />
|
return <MaterialIcon icon="call" {...props} />
|
||||||
case IconName.HairdryerInRoomAllScandic:
|
case IconName.HairdryerInRoomAllScandic:
|
||||||
return <HairdryerIcon {...props} />
|
return <HairdryerIcon {...props} />
|
||||||
case IconName.ComplimentaryColdRefreshments:
|
case IconName.ComplimentaryColdRefreshments:
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
.iconWrapper {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,6 @@ import { HTMLAttributes } from "react"
|
|||||||
import { MaterialIconName, materialIcons } from "./generated"
|
import { MaterialIconName, materialIcons } from "./generated"
|
||||||
import { VariantProps } from "class-variance-authority"
|
import { VariantProps } from "class-variance-authority"
|
||||||
import { iconVariants } from "../variants"
|
import { iconVariants } from "../variants"
|
||||||
import styles from "./index.module.css"
|
|
||||||
|
|
||||||
export interface MaterialIconProps
|
export interface MaterialIconProps
|
||||||
extends
|
extends
|
||||||
@@ -52,12 +51,7 @@ export function MaterialIcon({
|
|||||||
const iconClassName = iconVariants({ color })
|
const iconClassName = iconVariants({ color })
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<span
|
<span data-testid="MaterialIcon" data-icon-name={icon} {...props}>
|
||||||
data-testid="MaterialIcon"
|
|
||||||
data-icon-name={icon}
|
|
||||||
className={`${styles.iconWrapper}`}
|
|
||||||
{...props}
|
|
||||||
>
|
|
||||||
<IconComponent
|
<IconComponent
|
||||||
width={size}
|
width={size}
|
||||||
height={size}
|
height={size}
|
||||||
|
|||||||
Reference in New Issue
Block a user