Skip to content

Commit cd7dd86

Browse files
vesameskanentuomas-lindell
authored andcommitted
Merge pull request #5571 from HSLdevcom/AB#336
AB#336 fix transit leg end fill color
2 parents d697995 + 766f74a commit cd7dd86

File tree

8 files changed

+13
-20
lines changed

8 files changed

+13
-20
lines changed

app/component/itinerary/ItineraryCircleLine.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ItineraryCircleLine extends React.Component {
5353
xmlns="http://www.w3.org/2000/svg"
5454
width={28}
5555
height={28}
56-
style={{ fill: this.props.color, stroke: this.props.color }}
56+
style={{ fill: '#fff', stroke: this.props.color }}
5757
>
5858
<circle strokeWidth="4" width={28} cx={11} cy={10} r={6} />
5959
</svg>
@@ -100,7 +100,7 @@ class ItineraryCircleLine extends React.Component {
100100
xmlns="http://www.w3.org/2000/svg"
101101
width={28}
102102
height={28}
103-
style={{ fill: this.props.color, stroke: this.props.color }}
103+
style={{ fill: '#fff', stroke: this.props.color }}
104104
>
105105
<circle strokeWidth="4" width={28} cx={11} cy={10} r={6} />
106106
</svg>

app/component/itinerary/ItineraryCircleLineWithIcon.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class ItineraryCircleLineWithIcon extends React.Component {
9494
xmlns="http://www.w3.org/2000/svg"
9595
width={28}
9696
height={28}
97-
style={{ fill: this.props.color, stroke: this.props.color }}
97+
style={{ fill: '#fff', stroke: this.props.color }}
9898
>
9999
<circle strokeWidth="4" width={28} cx={11} cy={10} r={6} />
100100
</svg>

app/configurations/config.default.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable prefer-template */
21
import safeJsonParse from '../util/safeJsonParser';
32
import { BIKEAVL_WITHMAX } from '../util/vehicleRentalUtils';
43
import realtime from './realtimeUtils';

app/configurations/config.hameenlinna.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable prefer-template */
21
import configMerger from '../util/configMerger';
32
import walttiConfig from './config.waltti';
43

app/configurations/config.hsl.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable prefer-template */
21
import { BIKEAVL_WITHMAX } from '../util/vehicleRentalUtils';
32
import prUtils from '../util/ParkAndRideUtils';
43
import ttConfig from './timetableConfigUtils';

app/configurations/config.matka.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable prefer-template */
21
import HSLConfig from './config.hsl';
32
import TurkuConfig from './config.turku';
43
import LappeenrantaConfig from './config.lappeenranta';

app/configurations/config.vaasa.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable */
21
import configMerger from '../util/configMerger';
32
import walttiConfig from './config.waltti';
43

@@ -9,14 +8,14 @@ const APP_DESCRIPTION = '';
98
const minLat = 63.005;
109
const maxLat = 63.152;
1110
const minLon = 21.527;
12-
const maxLon = 22.170;
11+
const maxLon = 22.17;
1312
const IS_DEV =
14-
process.env.RUN_ENV === 'development' ||
15-
process.env.NODE_ENV !== 'production';
13+
process.env.RUN_ENV === 'development' ||
14+
process.env.NODE_ENV !== 'production';
1615

1716
const virtualMonitorBaseUrl = IS_DEV
18-
? 'https://dev-vaasamonitori.digitransit.fi'
19-
: 'https://pysakit-vaasa.digitransit.fi';
17+
? 'https://dev-vaasamonitori.digitransit.fi'
18+
: 'https://pysakit-vaasa.digitransit.fi';
2019

2120
export default configMerger(walttiConfig, {
2221
CONFIG,
@@ -76,11 +75,11 @@ export default configMerger(walttiConfig, {
7675
content: [
7776
{
7877
name: 'menu-feedback',
79-
href: {
78+
href: {
8079
fi: 'https://kartta.vaasa.fi/eFeedback/fi/Feedback/6-Joukkoliikenne',
8180
sv: 'https://kartta.vaasa.fi/eFeedback/sv/Feedback/6-Kollektivtrafik',
8281
en: 'https://kartta.vaasa.fi/eFeedback/fi/Feedback/6-Joukkoliikenne',
83-
}
82+
},
8483
},
8584
{
8685
name: 'about-this-service',
@@ -145,7 +144,7 @@ export default configMerger(walttiConfig, {
145144
mainMenu: {
146145
stopMonitor: {
147146
show: true,
148-
url:`${virtualMonitorBaseUrl}/createview`,
147+
url: `${virtualMonitorBaseUrl}/createview`,
149148
},
150149
},
151150

@@ -164,10 +163,10 @@ export default configMerger(walttiConfig, {
164163
zoneIdMapping: {
165164
1: 'A',
166165
2: 'B',
167-
3: 'C'
166+
3: 'C',
168167
},
169168
zones: {
170169
stops: true,
171170
itinerary: true,
172-
}
171+
},
173172
});

app/configurations/timetableConfigUtils.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
/* eslint-disable no-unused-vars */
2-
/* eslint-disable prefer-template */
3-
42
export default {
53
HSL: {
64
routeTimetableUrlResolver: function routeTimetableUrlResolver(

0 commit comments

Comments
 (0)