Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(edges): Fix colors for selected/hovered edges for light and dark themes #258

Merged
merged 1 commit into from
Dec 4, 2024
Merged

fix(edges): Fix colors for selected/hovered edges for light and dark themes #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/module/src/components/nodes/labels/LabelBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ const LabelBadge = React.forwardRef<SVGRectElement, LabelBadgeProps>(
height += paddingY * 2;
rect = (
<rect
fill={badgeColor || (badgeClassName ? undefined : defaultBadgeFill.value)}
stroke={badgeBorderColor || (badgeClassName ? undefined : defaultBadgeBorder.value)}
style={{
fill: badgeColor || (badgeClassName ? undefined : defaultBadgeFill.value),
stroke: badgeBorderColor || (badgeClassName ? undefined : defaultBadgeBorder.value)
}}
ref={iconRef}
x={0}
width={width + paddingX * 2}
Expand All @@ -55,7 +57,7 @@ const LabelBadge = React.forwardRef<SVGRectElement, LabelBadgeProps>(
<g className={classes} transform={`translate(${x}, ${y})`} ref={innerRef}>
{rect}
<text
fill={badgeTextColor || badgeClassName ? badgeTextColor : defaultBadgeTextColor.value}
style={{ fill: badgeTextColor || badgeClassName ? badgeTextColor : defaultBadgeTextColor.value }}
ref={textRef}
x={width / 2 + paddingX}
y={height / 2}
Expand Down
8 changes: 5 additions & 3 deletions packages/module/src/css/topology-components.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,12 @@
/* edge */
--pf-topology__edge--Stroke: #707070;
--pf-topology__edge--StrokeWidth: var(--pf-t--global--border--width--regular);
--pf-topology__edge--HoverStroke: var(--pf-t--global--border--color--hover);
--pf-topology__edge--HoverStroke: var(--pf-topology__edge--Stroke);
--pf-topology__edge--ActiveStroke: var(--pf-t--global--border--color--clicked);
--pf-topology__edge--ActiveStrokeWidth: var(--pf-t--global--border--width--strong);
--pf-topology__edge--InteractiveStroke: var(--pf-t--global--border--color--brand--default);
--pf-topology__edge--m-selected--background--Stroke: var(--pf-topology__edge--ActiveStroke);
--pf-topology__edge--m-selected--background--Opacity: 0.3;

--pf-topology__edge--m-info--EdgeStroke: var(--pf-t--global--border--color--brand--default);
--pf-topology__edge--m-success--EdgeStroke: var(--pf-t--global--border--color--status--success--default);
Expand All @@ -164,8 +166,7 @@
--pf-topology__edge--m-warning--EdgeFill: var(--pf-t--global--border--color--status--warning--default);
--pf-topology__edge--m-danger--EdgeFill: var(--pf-t--global--border--color--status--danger--default);

--pf-topology__edge--m-selected--background--Stroke: var(--pf-t--global--border--color--default);
--pf-topology__edge--m-hover--background--Stroke: var(--pf-t--global--border--color--nonstatus--blue--default);
--pf-topology__edge--m-hover--background--Stroke: var(--pf-t--global--border--color--default);

--pf-topology__edge__tag__text--Fill: var(--pf-t--global--text--color--inverse);
--pf-topology__edge__tag__text--Stroke: var(--pf-t--global--text--color--inverse);
Expand Down Expand Up @@ -667,6 +668,7 @@
}
.pf-topology__edge.pf-m-selected .pf-topology__edge__background {
stroke: var(--pf-topology__edge--m-selected--background--Stroke);
opacity: var(--pf-topology__edge--m-selected--background--Opacity);
}
.pf-topology__edge.pf-m-hover .pf-topology__edge__background {
stroke: var(--pf-topology__edge--m-hover--background--Stroke);
Expand Down
1 change: 0 additions & 1 deletion packages/module/src/pipelines/components/groups/DefaultTaskGroupCollapsed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const DefaultTaskGroupCollapsed: React.FunctionComponent<DefaultTaskGroupCollaps
return (
<TaskNode
element={element}
{...rest}
actionIcon={collapsible ? <ExpandIcon /> : undefined}
onActionIconClick={() => onCollapseChange(element, false)}
shadowCount={shadowCount}
Expand Down
10 changes: 7 additions & 3 deletions packages/module/src/pipelines/components/nodes/TaskBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ const TaskBadge = React.forwardRef<SVGRectElement, LabelBadgeProps>(
height += paddingY * 2;
rect = (
<rect
fill={badgeColor || (badgeClassName ? undefined : defaultBadgeFill.value)}
stroke={badgeBorderColor || (badgeClassName ? undefined : defaultBadgeBorder.value)}
style={{
fill: badgeColor || (badgeClassName ? undefined : defaultBadgeFill.value),
stroke: badgeBorderColor || (badgeClassName ? undefined : defaultBadgeBorder.value)
}}
ref={iconRef}
x={0}
width={width + paddingX * 2}
Expand All @@ -55,7 +57,9 @@ const TaskBadge = React.forwardRef<SVGRectElement, LabelBadgeProps>(
{rect}
{typeof badge === 'string' ? (
<text
fill={badgeTextColor || badgeClassName ? undefined : defaultBadgeTextColor.value}
style={{
fill: badgeTextColor || badgeClassName ? undefined : defaultBadgeTextColor.value
}}
ref={textRef}
x={width / 2 + paddingX}
y={height / 2}
Expand Down
Loading