Skip to content

Commit

Permalink
Merge pull request #5181 from HSLdevcom/DT-6578
Browse files Browse the repository at this point in the history
DT-6578: Style fixes
  • Loading branch information
vesameskanen authored Dec 2, 2024
2 parents 373966c + 31bfe6e commit e39cfd3
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 20 deletions.
12 changes: 6 additions & 6 deletions app/component/itinerary/navigator/NaviCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ export default function NaviCard({
legType={legType}
time={time}
/>
<div type="button" className="navitop-arrow">
<Icon
img="icon-icon_arrow-collapse"
className={`cursor-pointer ${cardExpanded ? 'inverted' : ''}`}
/>
</div>
</div>
<div type="button" className="navitop-arrow">
<Icon
img="icon-icon_arrow-collapse"
className={`cursor-pointer ${cardExpanded ? 'inverted' : ''}`}
/>
</div>
</div>
{cardExpanded && (
Expand Down
1 change: 1 addition & 0 deletions app/component/itinerary/navigator/NaviCardContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ function NaviCardContainer(
const handleClick = () => {
setCardExpanded(!cardExpanded);
};

useEffect(() => {
if (cardRef.current) {
const contentHeight = cardRef.current.clientHeight;
Expand Down
2 changes: 1 addition & 1 deletion app/component/itinerary/navigator/NaviInstructions.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function NaviInstructions(
</div>
{distance && duration && (
<div className={cx('duration', fadeOut && 'fade-out')}>
{displayDistance(distance, config, intl.formatNumber)} &nbsp; (
{displayDistance(distance, config, intl.formatNumber)} (
{durationToString(duration * 1000)})
</div>
)}
Expand Down
31 changes: 18 additions & 13 deletions app/component/itinerary/navigator/navigator.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@
top: 80px;
width: 92%;
margin-left: 4%;
border-radius: 15px;
border-radius: 8px;
min-height: 70px;
color: black;
background-color: white !important;
display: flex;
align-items: center;
letter-spacing: -0.3px;
box-shadow: 0 2px 4px 0 rgba(51, 51, 51, 0.2);

&.expanded {
max-height: unset;
Expand All @@ -62,9 +64,6 @@
.inverted {
transform: rotate(180deg);
}

position: absolute;
right: 20px;
}

.content {
Expand Down Expand Up @@ -149,7 +148,7 @@
margin-left: 10px;
font-size: $font-size-small;
font-weight: $font-weight-book;
max-width: 120px;
max-width: 85%;
text-align: left;
align-content: center;
}
Expand All @@ -170,6 +169,7 @@
font-size: $font-size-xsmall;
font-weight: $font-weight-book;
display: flex;
margin-top: 4px;
}
}

Expand All @@ -180,7 +180,7 @@

.extension-divider {
border: 1px solid #ddd;
width: 75%;
width: 85%;
margin-left: 35px;
margin-top: var(--space-s);
margin-bottom: var(--space-s);
Expand Down Expand Up @@ -229,6 +229,7 @@
margin-left: var(--space-xs);
justify-content: center;
font-size: $font-size-small;
max-width: 85%;
}
}

Expand Down Expand Up @@ -361,7 +362,7 @@
height: 69px;
margin-left: 5%;
width: 90%;
top: 160px;
letter-spacing: -0.3px;

div:first-child {
margin-top: 0;
Expand All @@ -382,10 +383,12 @@

.info-stack-item {
position: relative;
border-radius: 15px;
border-radius: 8px;
display: flex;
align-items: center;
padding: 16px;
box-shadow: 0 2px 4px 0 rgba(51, 51, 51, 0.2);
animation: slideIn 0.5s ease-out forwards;

.icon-container {
display: flex;
Expand All @@ -403,6 +406,7 @@

.navi-alert-content {
width: 100%;
margin: 0 8px;
}
}

Expand All @@ -412,7 +416,7 @@
.navi-alert-content {
display: flex;
flex-direction: column;
margin-left: 8px;
margin: 0 8px;

span:first-child {
font-weight: $font-weight-medium;
Expand Down Expand Up @@ -460,13 +464,13 @@
margin-left: 1px;

.icon-container {
height: 24px;
width: 24px;
height: 32px;
width: 32px;

.icon {
&.notification-close {
width: 24px;
height: 24px;
width: 32px;
height: 32px;
}
}
}
Expand Down Expand Up @@ -499,6 +503,7 @@
display: flex;
flex-direction: column;
margin-left: 8px;
margin-right: 8px;
width: 100%;

span:first-child {
Expand Down

0 comments on commit e39cfd3

Please sign in to comment.