Skip to content

Commit

Permalink
💄 #78 add some symbole + cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@JAGFx
JAGFx committed Feb 10, 2022
1 parent c86bf87 commit 133e4cc
Show file tree
Hide file tree
Showing 8 changed files with 4,260 additions and 3,844 deletions.
7,965 changes: 4,178 additions & 3,787 deletions resources/icons/scania-icon.ai
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions resources/icons/svgs/scania-accrued-rest-time-tachograph_white.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/icons/svgs/scania-average-vehicle-speed_white.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/icons/svgs/scania-driver-card-tachograph_white.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/icons/svgs/scania-total-distance-driven_white.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 26 additions & 15 deletions src/assets/scss/dashboard/scania/_menu.scss
View file
Expand Up @@ -9,14 +9,14 @@
@import "variable";

.mainMenu {
background: $cGrey;
cursor: pointer;
width: 437px;
max-width: 437px;
height: 346px;
background: $cGrey;
cursor: pointer;
width: 437px;
max-width: 437px;
height: 346px;
border-bottom: 3px solid $cGreyLight;
opacity: 1;
z-index: 30;
opacity: 1;
z-index: 30;

.menuSelectorItem {
i {
Expand Down Expand Up @@ -47,17 +47,28 @@

.drivingAssistanceMenu {
background-color: $cGrey;
//background-image: url("/img/dashboard/scania/dashMenu1.png");
opacity: 1;
z-index: 19;
padding-right: 1.5rem;
position: relative;


.drivingAssistanceMenu-unit{
position: absolute;
bottom: 0;
right: 0;
width: 4rem;
text-align: center;
.item {
font-size: 2.5rem;
padding: 0 1rem;

.icon {
font-size: 3.5rem;

> small {
font-size: 2rem;
margin-top: 1rem;
margin-left: .5rem;
}
}

.value { color: $cGreen; }

.unit { margin-left: .5rem; }
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/dashboards/scania/display/ScaniaDisplay.vue
View file
Expand Up @@ -96,8 +96,8 @@
>
<div class="item d-flex justify-content-between align-items-center w-100">
<div class="icon">
<i class="icon-scania-ad-blue-low_yellow" />
<i class="icon-scania-ad-blue-low_yellow" />
<i class="icon-scania-driver-card-tachograph_white" />
<i class="ml-3 icon-scania-accrued-rest-time-tachograph_white" />
</div>
<div
class="value-wrapper d-flex justify-content-between align-items-center"
Expand Down
90 changes: 50 additions & 40 deletions src/components/dashboards/scania/display/ScaniaMainMenu.vue
View file
Expand Up @@ -38,46 +38,56 @@
class="drivingAssistanceMenu w-100 h-100 d-flex justify-content-center align-items-start flex-column"
@click="subMenu = null"
>
<ScaniaBar
class="my-2"
v-bind="{
min: 0,
max: $psiToCurrentPressureUnit(175),
value: 0,
unit: config('unit_pressure'),
disabled: true
}"
<div
class="item d-flex justify-content-between align-items-center w-100 py-2"
>
<i class="icon icon-scania-retarder_green" />
</ScaniaBar>
<ScaniaBar
class="my-2"
v-bind="{
min: 0,
max: $psiToCurrentPressureUnit(175),
value: 0,
unit: config('unit_pressure'),
disabled: true
}"
<div class="icon flex-area">
<i class="icon-scania-total-distance-driven_white" />
<small class="text-uppercase">tot</small>
</div>
<div class="flex-area">
<div class="value">-</div>
<div class="unit">{{ unit_length(1, 'km', false, true) }}</div>
</div>
</div>

<div
class="item d-flex justify-content-between align-items-center w-100 py-2"
>
<i class="icon icon-scania-retarder_green" />
</ScaniaBar>
<ScaniaBar
class="my-2"
v-bind="{
min: 0,
max: $psiToCurrentPressureUnit(175),
value: unit_pressure(
telemetry.truck.brakes.airPressure.value,
true,
false
),
unit: config('unit_pressure')
}"
<div class="icon flex-area">
<i class="icon-scania-average-vehicle-speed_white" />
<small class="text-uppercase">ave</small>
</div>
<div class="flex-area">
<div class="value">-</div>
<div class="unit">{{ unit_speed(100, false, true) }}</div>
</div>
</div>

<div
class="item d-flex justify-content-between align-items-center w-100 py-2"
>
<i class="icon icon-scania-parking-break_red" />
</ScaniaBar>
<!-- <span class="drivingAssistanceMenu-unit">[bar]</span>-->
<div class="icon flex-area">
<i class="icon-scania-fuel_yellow" />
<small class="text-uppercase">ave</small>
</div>
<div class="flex-area">
<div class="value">
{{
unit_consumption(
telemetry.truck.fuel.avgConsumption,
true,
false
).toFixed(1)
}}
</div>
<div class="unit">
{{
unit_consumption(telemetry.truck.fuel.avgConsumption, false, true)
}}
</div>
</div>
</div>
</div>
<!-- </editor-folder> Driving assistance -->

Expand Down Expand Up @@ -127,16 +137,16 @@
class="my-2"
v-bind="{
min: 0,
max: $psiToCurrentPressureUnit(102),
max: $psiToCurrentPressureUnit(175),
value: unit_pressure(
telemetry.truck.engine.oilPressure.value,
telemetry.truck.brakes.airPressure.value,
true,
false
),
unit: config('unit_pressure')
}"
>
<i class="icon icon-scania-oil-pressure_red_yellow" />
<i class="icon icon-scania-parking-break_red" />
</ScaniaBar>
<ScaniaBar
class="my-2"
Expand Down

0 comments on commit 133e4cc

Please sign in to comment.