[251217] merge: gitlab develop_si 변경사항 병합
This commit is contained in:
@@ -5,9 +5,13 @@ import { compose } from 'ramda/src/compose';
|
|||||||
|
|
||||||
import Spotlight from '@enact/spotlight';
|
import Spotlight from '@enact/spotlight';
|
||||||
import Spottable from '@enact/spotlight/Spottable';
|
import Spottable from '@enact/spotlight/Spottable';
|
||||||
import { Marquee, MarqueeController } from '@enact/ui/Marquee';
|
import {
|
||||||
|
Marquee,
|
||||||
|
MarqueeController,
|
||||||
|
} from '@enact/ui/Marquee';
|
||||||
|
|
||||||
import icon_arrow_dwon from '../../../../../assets/images/player/icon_tabcontainer_arrow_down.png';
|
import icon_arrow_dwon
|
||||||
|
from '../../../../../assets/images/player/icon_tabcontainer_arrow_down.png';
|
||||||
import CustomImage from '../../../../components/CustomImage/CustomImage';
|
import CustomImage from '../../../../components/CustomImage/CustomImage';
|
||||||
import { SpotlightIds } from '../../../../utils/SpotlightIds';
|
import { SpotlightIds } from '../../../../utils/SpotlightIds';
|
||||||
import css from './LiveChannelNext.module.less';
|
import css from './LiveChannelNext.module.less';
|
||||||
@@ -18,7 +22,7 @@ export default function LiveChannelNext({
|
|||||||
channelLogo,
|
channelLogo,
|
||||||
channelName = 'ShopLC',
|
channelName = 'ShopLC',
|
||||||
programName = 'Sandal Black...',
|
programName = 'Sandal Black...',
|
||||||
backgroundColor = 'linear-gradient(180deg, #284998 0%, #06B0EE 100%)',
|
backgroundColor = 'transparent',
|
||||||
onClick,
|
onClick,
|
||||||
onFocus,
|
onFocus,
|
||||||
spotlightId = 'live-channel-next-button',
|
spotlightId = 'live-channel-next-button',
|
||||||
@@ -53,8 +57,7 @@ export default function LiveChannelNext({
|
|||||||
>
|
>
|
||||||
<div className={css.logoWrapper}>
|
<div className={css.logoWrapper}>
|
||||||
<div
|
<div
|
||||||
className={css.logoBackground}
|
className={css.logoBackground}
|
||||||
style={{ background: backgroundColor }}
|
|
||||||
>
|
>
|
||||||
{channelLogo ? (
|
{channelLogo ? (
|
||||||
<CustomImage
|
<CustomImage
|
||||||
|
|||||||
@@ -41,6 +41,7 @@
|
|||||||
height: 72px;
|
height: 72px;
|
||||||
position: relative;
|
position: relative;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
.logoBackground {
|
.logoBackground {
|
||||||
@@ -51,6 +52,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
.logoImage {
|
.logoImage {
|
||||||
@@ -60,6 +62,7 @@
|
|||||||
&.qvcLogoImg {
|
&.qvcLogoImg {
|
||||||
width: 70%;
|
width: 70%;
|
||||||
height: 70%;
|
height: 70%;
|
||||||
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user