Skip to content
Snippets Groups Projects
Commit 81d66fd9 authored by Lene Wasskog's avatar Lene Wasskog
Browse files

feat: Change styling of labels in lists

parent b024cef8
Branches
No related tags found
No related merge requests found
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
<div v-else class="row"> <div v-else class="row">
<div class="col-8"> <div class="col-8">
{{ obs.timeOfObservation | dateFormat }} <br/><b>{{obs.observationHeading}}</b> <span class="list-label">{{ obs.timeOfObservation | dateFormat }}</span><br/>{{obs.observationHeading}}
</div> </div>
<div class="col-4 d-flex align-items-center justify-content-end"> <div class="col-4 d-flex align-items-center justify-content-end">
<router-link v-if="obs.observationTimeSeriesId" <router-link v-if="obs.observationTimeSeriesId"
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</div> </div>
<div v-else class="row"> <div v-else class="row">
<div class="col-9"> <div class="col-9">
<span class="timeseries-label">{{label(ots)}}</span><br>{{ ots.name }} <span class="list-label">{{label(ots)}}</span><br>{{ ots.name }}
</div> </div>
<div class="col-3 d-flex align-items-center justify-content-end"> <div class="col-3 d-flex align-items-center justify-content-end">
<span class="badge badge-pill badge-info">{{ getObservationCount(ots.observationTimeSeriesId) }}</span> <span class="badge badge-pill badge-info">{{ getObservationCount(ots.observationTimeSeriesId) }}</span>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
class="list-group-item list-group-item-action bg-light" class="list-group-item list-group-item-action bg-light"
v-bind:class="{'text-danger':obs.isNew, 'text-primary':obs.toUpload, 'text-secondary':obs.isDeleted}" v-bind:class="{'text-danger':obs.isNew, 'text-primary':obs.toUpload, 'text-secondary':obs.isDeleted}"
v-if="!obs.isDeleted" v-bind:key="obs.observationId"> v-if="!obs.isDeleted" v-bind:key="obs.observationId">
{{ obs.timeOfObservation | dateFormat }}<br/>{{ obs.observationHeading }} <span class="list-label">{{ obs.timeOfObservation | dateFormat }}</span><br/>{{ obs.observationHeading }}
</router-link> </router-link>
</li> </li>
</ul> </ul>
...@@ -190,11 +190,11 @@ export default { ...@@ -190,11 +190,11 @@ export default {
} }
}, },
loadObservationMapFromLocalStore() { loadObservationMapFromLocalStore() {
const jsonLocalObservationList = localStorage.getItem(CommonUtil.CONST_STORAGE_OBSERVATION_LIST); const localObservationList = localStorage.getItem(CommonUtil.CONST_STORAGE_OBSERVATION_LIST);
if (jsonLocalObservationList) { if (localObservationList) {
const localObservationList = JSON.parse(jsonLocalObservationList); const jsonLocalObservationList = JSON.parse(localObservationList);
this.observationMap = {}; this.observationMap = {};
localObservationList.forEach(observation => { jsonLocalObservationList.forEach(observation => {
const ostId = observation.observationTimeSeries && observation.observationTimeSeries.observationTimeSeriesId ? observation.observationTimeSeries.observationTimeSeriesId : undefined; const ostId = observation.observationTimeSeries && observation.observationTimeSeries.observationTimeSeriesId ? observation.observationTimeSeries.observationTimeSeriesId : undefined;
// If observation has been deleted (but not yet synced) - remove from map // If observation has been deleted (but not yet synced) - remove from map
if (observation.deleted) { if (observation.deleted) {
...@@ -304,13 +304,6 @@ a { ...@@ -304,13 +304,6 @@ a {
text-decoration: underline !important; text-decoration: underline !important;
} }
.timeseries-label {
font-family: monospace;
color: grey;
font-size: 0.8rem;
}
.small-icon { .small-icon {
color: #3d8052; color: #3d8052;
margin-right: 5px; margin-right: 5px;
......
...@@ -16,6 +16,12 @@ body { ...@@ -16,6 +16,12 @@ body {
} }
.list-label {
font-family: monospace;
color: grey;
font-size: 0.8rem;
}
a.nav-link{ a.nav-link{
color: black !important; color: black !important;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment