From 233e2b7293ee429d230f390b29bf765da63c2ae7 Mon Sep 17 00:00:00 2001 From: Victor Genaev Date: Wed, 20 Jul 2022 18:46:17 +0200 Subject: [PATCH] fix(ItineraryIcon): add new icon from figma (#3529) --- .../src/Itinerary/ItinerarySegment/ItineraryIcon.jsx | 8 +++----- .../ItinerarySegment/ItinerarySegmentStop/index.jsx | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/orbit-components/src/Itinerary/ItinerarySegment/ItineraryIcon.jsx b/packages/orbit-components/src/Itinerary/ItinerarySegment/ItineraryIcon.jsx index e285b07a4e..4d87ea11a4 100644 --- a/packages/orbit-components/src/Itinerary/ItinerarySegment/ItineraryIcon.jsx +++ b/packages/orbit-components/src/Itinerary/ItinerarySegment/ItineraryIcon.jsx @@ -29,9 +29,7 @@ const IconStyled = styled.div` justify-content: center; z-index: 1; svg { - background: ${(last || index === 0) && !isPrevHidden - ? "transparent" - : theme.orbit.paletteWhite}; + background: ${last || index === 0 ? "transparent" : theme.orbit.paletteWhite}; overflow: hidden; } ${index > 0 && @@ -51,7 +49,7 @@ const IconStyled = styled.div` count > 0 && css` &:before { - top: -9px; + top: ${last && isPrevHidden ? "-14px" : "-9px"}; border: 1px ${isPrevHidden ? "dashed" : "solid"} ${theme.orbit.paletteCloudNormalActive}; ${lineMixin}; } @@ -61,7 +59,7 @@ const IconStyled = styled.div` count > 0 && css` &:after { - bottom: -7px; + bottom: ${isHidden ? "4px" : "-9px"}; border: 1px ${isHidden ? "dashed" : "solid"} ${theme.orbit.paletteCloudNormalActive}; ${lineMixin}; } diff --git a/packages/orbit-components/src/Itinerary/ItinerarySegment/ItinerarySegmentStop/index.jsx b/packages/orbit-components/src/Itinerary/ItinerarySegment/ItinerarySegmentStop/index.jsx index 944d20b013..901ff9e21b 100644 --- a/packages/orbit-components/src/Itinerary/ItinerarySegment/ItinerarySegmentStop/index.jsx +++ b/packages/orbit-components/src/Itinerary/ItinerarySegment/ItinerarySegmentStop/index.jsx @@ -2,7 +2,7 @@ import * as React from "react"; import styled, { css } from "styled-components"; -import { StarFull, CircleEmpty, Circle } from "../../../icons"; +import { StarFull, CircleSmallEmpty as CircleEmpty, CircleSmall as Circle } from "../../../icons"; import { useWidth } from "../../context"; import defaultTheme from "../../../defaultTheme"; import Stack from "../../../Stack"; @@ -62,7 +62,7 @@ const ItinerarySegmentStopIcon = ({ |}) => { if (icon) return icon; if (isHidden) return ; - if (isPrevHidden && isLast) return ; + if (isPrevHidden && isLast) return ; return ; };