Skip to content

Commit 6a10475

Browse files
committed
wip: properties panel selection glow on segment header
1 parent e0969ef commit 6a10475

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
@import '_variables';
22

3+
$glow-color: rgba(255, 255, 255, 0.58);
4+
35
.element-selected {
4-
// Base glow
5-
box-shadow: inset 0 0 15px var(--primary-color, #ffffff7a);
6-
// Changed animation name from 'blinker' to 'glow' to better reflect its purpose
7-
animation: glow 1s ease-in-out infinite;
6+
box-shadow: inset 0 0 15px $glow-color;
7+
animation: subtle-glow 1s ease-in-out infinite;
88

9-
@keyframes glow {
9+
@keyframes subtle-glow {
1010
0%, 100% {
11-
box-shadow: inset 0 0 15px var(--primary-color, #ffffff7b);
11+
box-shadow: inset 0 0 15px $glow-color;
1212
}
1313
50% {
14-
box-shadow: inset 0 0 20px var(--primary-color, #ffffff84),
15-
inset 0 0 30px var(--primary-light-color, #ffffff86);
14+
box-shadow: inset 0 0 25px $glow-color,
15+
inset 0 0 35px $glow-color;
1616
}
1717
}
1818
}

packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.tsx

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ import { logger } from '../../lib/logging'
5757
import * as RundownResolver from '../../lib/RundownResolver'
5858
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
5959
import { SelectedElementsContext } from '../RundownView/SelectedElementsContext'
60+
import classNames from 'classnames'
6061

6162
interface IProps {
6263
id: string
@@ -1051,17 +1052,20 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
10511052
aria-roledescription={t('segment')}
10521053
aria-labelledby={`segment-name-${this.props.segment._id}`}
10531054
>
1054-
<ContextMenuTrigger
1055-
id="segment-timeline-context-menu"
1056-
collect={this.getSegmentContext}
1057-
attributes={{
1058-
className: 'segment-timeline__title',
1059-
}}
1060-
holdToDisplay={contextMenuHoldToDisplayTime()}
1061-
renderTag="div"
1062-
>
1063-
<SelectedElementsContext.Consumer>
1064-
{(selectElementContext) => (
1055+
<SelectedElementsContext.Consumer>
1056+
{(selectElementContext) => (
1057+
<ContextMenuTrigger
1058+
id="segment-timeline-context-menu"
1059+
collect={this.getSegmentContext}
1060+
attributes={{
1061+
className: classNames(
1062+
'segment-timeline__title',
1063+
selectElementContext.isSelected(this.props.segment._id) ? 'element-selected' : ''
1064+
),
1065+
}}
1066+
holdToDisplay={contextMenuHoldToDisplayTime()}
1067+
renderTag="div"
1068+
>
10651069
<div
10661070
onDoubleClick={() => {
10671071
if (this.props.studio.settings.enableUserEdits) {
@@ -1076,8 +1080,7 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
10761080
<h2
10771081
id={`segment-name-${this.props.segment._id}`}
10781082
className={ClassNames(
1079-
'segment-timeline__title__label' + (this.props.segment.identifier ? ' identifier' : ''),
1080-
selectElementContext.isSelected(this.props.segment._id) ? 'element-selected' : ''
1083+
'segment-timeline__title__label' + (this.props.segment.identifier ? ' identifier' : '')
10811084
)}
10821085
data-identifier={this.props.segment.identifier}
10831086
>
@@ -1128,9 +1131,9 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
11281131
)}
11291132
<HeaderEditStates userEditOperations={this.props.segment.userEditOperations} />
11301133
</div>
1131-
)}
1132-
</SelectedElementsContext.Consumer>
1133-
</ContextMenuTrigger>
1134+
</ContextMenuTrigger>
1135+
)}
1136+
</SelectedElementsContext.Consumer>
11341137
<div className="segment-timeline__duration" tabIndex={0}>
11351138
{this.props.playlist &&
11361139
this.props.parts &&

0 commit comments

Comments
 (0)