Merge branch 'frontend/timo_neu' into develop

This commit is contained in:
Timo Volkmann 2019-06-06 12:31:04 +02:00
commit 96d3a3836d
2 changed files with 4 additions and 5 deletions

View File

@ -46,7 +46,7 @@
<template> <template>
<vl-geom-point :coordinates="center"></vl-geom-point> <vl-geom-point :coordinates="center"></vl-geom-point>
<vl-style-box> <vl-style-box>
<vl-style-icon src="./statics/map-marker.svg" :scale="2" :anchor="[0.095,0.17]" <vl-style-icon src="./statics/map-marker_red.svg" :scale="2" :anchor="[0.095,0.17]"
:size="[128, 128]"></vl-style-icon> :size="[128, 128]"></vl-style-icon>
</vl-style-box> </vl-style-box>
</template> </template>
@ -171,7 +171,7 @@
return ['position-feature'].indexOf(feature.getId()) === -1 return ['position-feature'].indexOf(feature.getId()) === -1
}, },
onUpdatePosition(coordinate) { onUpdatePosition(coordinate) {
console.log("onUpdatePosition") // console.log("onUpdatePosition")
this.deviceCoordinate = coordinate; this.deviceCoordinate = coordinate;
this.$emit('updatecoords', this.center); this.$emit('updatecoords', this.center);
}, },

View File

@ -9,9 +9,8 @@
<div class="text-h6">GeoCaching</div> <div class="text-h6">GeoCaching</div>
<div class="text-body2">Willkommen</div> <div class="text-body2">Willkommen</div>
<q-expansion-item <q-expansion-item
expand-separator
rounded-borders rounded-borders
class="bg-primary text-black shadow-2 full-width q-mt-md" class="text-black shadow-2 full-width q-mt-md"
label="Was ist GeoCaching?" label="Was ist GeoCaching?"
> >
<q-card> <q-card>
@ -33,7 +32,7 @@
<q-card-section> <q-card-section>
<div class="text-h6">Loslegen</div> <div class="text-h6">Loslegen</div>
<q-btn color="primary" text-color="black" class="full-width q-mt-md" label="Zu den Caches" to="/Overview"/> <q-btn color="primary" class="full-width q-mt-md" label="Zu den Caches" to="/Overview"/>
</q-card-section> </q-card-section>
</q-card> </q-card>
</div> </div>