Skip to content

Commit

Permalink
Merge pull request #5176 from HSLdevcom/DT-6549
Browse files Browse the repository at this point in the history
DT-6549 accessible colors
  • Loading branch information
vesameskanen authored Nov 25, 2024
2 parents 0c4149a + 507fbfa commit 090b01f
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 18 deletions.
2 changes: 1 addition & 1 deletion app/component/bike-park-rental-station.scss
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
}

.external-link {
color: #007ac9;
color: $link-color;
text-decoration: none;
font-weight: $font-weight-medium;

Expand Down
1 change: 0 additions & 1 deletion app/component/itinerary/BicycleLeg.js
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,6 @@ export default function BicycleLeg(
<div className="link-to-e-scooter-operator">
<Icon
img="icon-icon_arrow-collapse--right"
color="#007ac9"
height={1}
width={1}
/>
Expand Down
7 changes: 1 addition & 6 deletions app/component/itinerary/ScooterLinkContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,7 @@ function ScooterLinkContainer(
href={rentalVehicleLink}
onClick={onClick}
>
<Icon
img="icon-icon_square_right_corner_arrow"
color="#007ac9"
height={1}
width={1}
/>
<Icon img="icon-icon_external-link-box" height={1} width={1} />
</ExternalLink>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion app/component/itinerary/VehicleRentalLeg.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ function VehicleRentalLeg(
<Link to={rentalStationLink}>
<Icon
img="icon-icon_arrow-collapse--right"
color="#007ac9"
height={1.3}
width={1.3}
/>
Expand Down
2 changes: 1 addition & 1 deletion app/component/itinerary/customize-search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@
}

.external-link {
color: $link-color-accessible;
color: $link-color;
text-decoration: none;
font-weight: $font-weight-medium;

Expand Down
1 change: 1 addition & 0 deletions app/component/itinerary/itinerary.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1670,6 +1670,7 @@ $itinerary-tab-switch-height: 48px;

.link-to-e-scooter-operator {
margin: auto 10px auto auto;
color: $link-color;
}

.citybike-itinerary {
Expand Down
3 changes: 2 additions & 1 deletion app/component/rental-vehicle-content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@

.link-to-e-scooter-operator {
margin: auto 10px auto auto;
color: $link-color;
}

.citybike-itinerary {
Expand Down Expand Up @@ -201,7 +202,7 @@
}

.external-link {
color: #007ac9;
color: $link-color;
text-decoration: none;
font-weight: $font-weight-medium;

Expand Down
2 changes: 1 addition & 1 deletion app/configurations/config.hsl.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export default {
mergeStopsByCode: true,
useExtendedRouteTypes: true,
colors: {
primary: '#007ac9',
primary: '#0074bf',
accessiblePrimary: '#0074be',
hover: '#0062a1',
iconColors: {
Expand Down
2 changes: 1 addition & 1 deletion sass/themes/apphsl/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@import '../default/theme';

/* Operator palette */
$hsl-blue: #007ac9;
$hsl-blue: #0074bf;
$hsl-dark-blue: #0062a1;
$hsl-pink: #f092cd;
$hsl-alert: #dc0451;
Expand Down
3 changes: 1 addition & 2 deletions sass/themes/default/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $cancelation-black: #666;
$cancelation-background: #fbe0ea;
$disruption-color: $cancelation-red;
$banner-disruption-color: $disruption-color;
$realtime-color: #46850e;
$realtime-color: #3b7f00;
$visited-link-color: #8c4799;
$current-location-color: $primary-color;
$desktop-title-color: $primary-color;
Expand All @@ -64,7 +64,6 @@ $top-bar-color: $primary-color;
$nav-content-color: false;
$disclaimer-background-color: rgba(254, 209, 0, 0.1);
$disclaimer-border-color: #fed100;
$link-color-accessible: $primary-color;

/* Vehicle palette */
$airplane-color: $livi-airplane-blue;
Expand Down
4 changes: 1 addition & 3 deletions sass/themes/hsl/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@import '../default/theme';

/* Operator palette */
$hsl-blue: #007ac9;
$hsl-blue: #0074bf;
$hsl-dark-blue: #0062a1;
$hsl-pink: #f092cd;
$hsl-alert: #dc0451;
Expand All @@ -13,7 +13,6 @@ $hsl-metro-orange: #ca4000;
$hsl-bus-express: #ca4000;
$hsl-rail-red: #8c4799;
$hsl-ferry-blue: #007a97;
$hsl-blue-accessible: #0074bf;

/* Application palette */
$primary-color: $hsl-blue;
Expand All @@ -34,7 +33,6 @@ $desktop-title-arrow-icon-color: $secondary-color;
$top-bar-color: $primary-color;
$disclaimer-background-color: #e5f2fa;
$disclaimer-border-color: #e5f2fa;
$link-color-accessible: $hsl-blue-accessible;

/* Vehicle palette */
$airplane-color: #0046ad;
Expand Down

0 comments on commit 090b01f

Please sign in to comment.