Skip to content

Commit 16be5d5

Browse files
committed
fixup! fix: dividing line between jobs and vehicles
1 parent 0e8f3d3 commit 16be5d5

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

src/fragments/forms/map-form/components/optimization/Optimization.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,16 @@
2727
{{ $t('optimization.addFromMap') + $t('optimization.job') }}
2828
</v-btn>
2929
<!-- low priority TODO: more elegant solution for this? -->
30-
<job-list v-if="mapViewData.hasRoutes()" :jobs="jobs" :jobs-shown="jobsExpanded" :map-view-data="mapViewData"
30+
<job-list class="content-list" v-if="mapViewData.hasRoutes()" :jobs="jobs" :jobs-shown="jobsExpanded" :map-view-data="mapViewData"
3131
v-show="jobsExpanded"></job-list>
32-
<job-list v-else :jobs="jobs" :jobs-shown="jobsExpanded"></job-list>
33-
<v-card v-if="!jobsExpanded" @click="jobsExpanded=!jobsExpanded">
32+
<job-list class="content-list" v-else :jobs="jobs" :jobs-shown="jobsExpanded"></job-list>
33+
<v-card class="content-list" v-if="!jobsExpanded" @click="jobsExpanded=!jobsExpanded">
3434
<v-card-title>
3535
<v-icon style="padding: 0 5px 0 7px">work</v-icon>
3636
<b>{{ $t('optimization.savedJobs') + jobs.length }}</b>
3737
</v-card-title>
3838
</v-card>
3939

40-
<!--TODO: add another thin divider?-->
4140
<div class="optimization-heading">
4241
{{ $t('optimization.vehicles') }} (Max: 3)
4342
<v-tooltip bottom style="float: right">
@@ -56,7 +55,7 @@
5655
{{ $t('optimization.addFromMap') + $t('optimization.vehicle') }}
5756
</v-btn>
5857
</div>
59-
<vehicle-list :vehicles="vehicles"></vehicle-list>
58+
<vehicle-list class="content-list" :vehicles="vehicles"></vehicle-list>
6059
<v-layout row class="form-actions-btns">
6160
<v-tooltip bottom style="float: right">
6261
<template v-slot:activator="{ on }">

src/fragments/forms/map-form/components/optimization/components/job-list/JobList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="job-inputs">
3-
<v-expansion-panel class="content-list" :value="jobExtended" :expand="true">
3+
<v-expansion-panel class="no-shadow" :value="jobExtended" :expand="true">
44
<v-expansion-panel-content style="background: transparent;" v-for="(j, i) in jobs" :key="i">
55
<div v-if="localMapViewData === null || !unassignedIds.includes(j.id)" slot="header" style="padding-bottom: 0;"><v-icon style="padding: 0 5px 0 0">work</v-icon><b>Job {{j.id}} - {{ j.location[0].toPrecision(8) }}, {{ j.location[1].toPrecision(8)}}</b></div>
66
<div v-else slot="header" style="padding-bottom: 0"><v-icon style="padding: 0 5px 0 0">work</v-icon><b>Job {{j.id}} - {{ j.location[0].toPrecision(8) }}, {{ j.location[1].toPrecision(8)}}

src/fragments/forms/map-form/components/optimization/components/job-list/job-list.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
color: darkgoldenrod
88
}
99

10-
.content-list {
10+
.no-shadow {
1111
box-shadow: none;
12-
border-bottom: 2px solid #c62828;
13-
margin: 0 0 5px 0;
1412
}

src/fragments/forms/map-form/components/optimization/components/vehicle-list/VehicleList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="vehicle-inputs">
3-
<v-expansion-panel class="content-list" :value="vehicleExtended" :expand="true">
3+
<v-expansion-panel class="no-shadow" :value="vehicleExtended" :expand="true">
44
<v-expansion-panel-content style="background: transparent;" v-for="(v, i) in vehicles" :key="i">
55
<div slot="header" style="padding-bottom: 0;"><v-icon :color="vehicleColors(v.id)" style="padding: 0 5px 0 0">{{vehicleIcon(v.profile)}}</v-icon><b>Vehicle {{v.id}} ({{v.profile}})</b></div>
66
<v-card-text>
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
.content-list {
1+
.no-shadow {
22
box-shadow: none;
3-
border-bottom: 2px solid #c62828;
4-
margin: 0 0 5px 0;
53
}

src/fragments/forms/map-form/components/optimization/optimization.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,8 @@ ul.vehicle-inputs {
4646
max-width: 58px;
4747
margin-left: 0;
4848
}
49+
50+
.content-list {
51+
box-shadow: none;
52+
border-bottom: 2px solid #c62828;
53+
}

0 commit comments

Comments
 (0)