tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop

Browse Source
This commit is contained in:
Maximilian Leopold 2019-06-04 19:37:26 +02:00
commit 7a1f2918ad
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
labswp_2019_sose_geocaching_frontend/frontend/src/components/qrscanner.vue
View File

@ -22,7 +22,7 @@
</qrcode-stream>
</qrcode-drop-zone>
<div class="q-ma-md">
<q-btn v-if="!askForPermission" @click="toggleCamera(!activateCamera)" :loading="loading" unelevated color="primary" stack
<q-btn v-if="!askForPermission" @click="toggleCamera(!activateCamera)" :loading="loading" unelevated color="negative" stack
label="Schließen" class="full-width"/>
</div>
</div>

2
labswp_2019_sose_geocaching_frontend/frontend/src/pages/qr-generator.vue
View File

@ -11,7 +11,7 @@
<p class="q-my-sm">{{ cacheId }}/{{ station.id }}</p>
</div>
</div>
<q-btn to="/overview" unelevated color="primary" stack
<q-btn to="/overview" unelevated color="negative" stack
label="Schließen" class="full-width"/>
</div>
</template>