Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions app_vue/src/components/sensorRouteBlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<div class="py-4 px-4 route-display__route-container">
<!-- route is present -->
<div class="w-100 h-100">
<div tabindex="0" class="w-100 h-100 d-flex align-center cursor-pointer">
<div tabindex="0" class="route-display__header">
<span class="font-body">
{{ state.selectedRouteList.length }} Bins
</span>
Expand All @@ -108,7 +108,7 @@
<!-- route list -->
<section>
<!-- starting point -->
<div class="d-flex align-center">
<div class="route-display__items">
<vue-feather class="color-green" type="disc"></vue-feather>
<span class="route-display__point ml-2 mt-4">{{ state.startPointAddress }}</span>
</div>
Expand All @@ -131,7 +131,7 @@
</template>
<!-- </draggable> -->
<!-- ending point -->
<div class="d-flex align-center mb-4">
<div class="route-display__items mb-4">
<vue-feather class="color-red mr-2" type="map-pin"></vue-feather>
<span class="route-display__point">{{ state.endPointAddress }}</span>
</div>
Expand Down Expand Up @@ -182,6 +182,18 @@
@include fontBodySmall;;
}

&__header {
display: flex;
align-items: center;
flex-direction: column;
margin-bottom: 20px;

@include mediumScreens {
flex-direction: row;
margin-bottom: 0;
}
}

&__route {
margin-bottom: 12px;
&:last-child {
Expand All @@ -194,9 +206,19 @@
align-items: center;
}

// &__items {
// cursor: pointer;
// }
&__items {
display: flex;
align-items: center;
flex-direction: column;
justify-content: center;
text-align: center;

@include mediumScreens {
text-align: left;
justify-content: flex-start;
flex-direction: row;
}
}

&__point {
max-width: 174px;
Expand Down
19 changes: 18 additions & 1 deletion app_vue/src/components/sensorSideBarFilters.vue
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@

<template>
<section class="filter-list">
<div class="text-h6 padding-b-30 d-flex align-center justify-space-between">
<div class="filter-list__heading">
<div class="d-flex align-center">
<span class="filter-list__title">Filter Sensors ({{ getFilterCount() }})</span>
<span class="mx-3">|</span>
Expand Down Expand Up @@ -265,6 +265,23 @@
.filter-list {
width: 100%;

&__heading {
display: flex;
align-items: center;
padding-bottom: 30px;
justify-content: space-between;
flex-direction: column;
@include fontHeading6;

@include smallScreens {
flex-direction: column;
}

@include mediumScreens {
flex-direction: row;
}
}

&__label {
@include fontBody;
}
Expand Down