mirror of
https://github.com/IT4Change/gradido.git
synced 2026-01-17 10:21:23 +00:00
fix bug #221
This commit is contained in:
parent
75be488fab
commit
92ba58858d
@ -58,7 +58,7 @@
|
||||
<hr class="my-3" />
|
||||
<ul class="navbar-nav mb-md-3">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-lg" @click="logout">
|
||||
<a class="nav-link text-lg" href @click="logout">
|
||||
{{ $t('logout') }}
|
||||
</a>
|
||||
</li>
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
<div>
|
||||
<b-row v-show="row_form">
|
||||
<b-col xl="12" md="12">
|
||||
<b-alert variant="warning" show dismissible v-html="$t('form.attention')"></b-alert>
|
||||
<b-alert show dismissible variant="warning" class="text-center">
|
||||
<span class="alert-text" v-html="$t('form.attention')"></span>
|
||||
</b-alert>
|
||||
<b-card class="p-0 p-md-3" style="background-color: #ebebeba3 !important">
|
||||
<b-alert show variant="secondary">
|
||||
<span class="alert-text" v-html="$t('form.scann_code')"></span>
|
||||
<b-col v-show="!scan" lg="12" class="text-right">
|
||||
<img src="/img/icons/gradido/qr-scan-pure.png" height="50" @click="scan = true" />
|
||||
<a @click="scan = true" class="nav-link">
|
||||
<img src="/img/icons/gradido/qr-scan-pure.png" height="50" />
|
||||
</a>
|
||||
</b-col>
|
||||
<b-alert v-show="scan" show variant="warning">
|
||||
<span class="alert-text" @click="scan = false">
|
||||
<strong>{{ $t('form.cancel') }}</strong>
|
||||
</span>
|
||||
</b-alert>
|
||||
|
||||
<div v-if="scan">
|
||||
<!-- <b-row>
|
||||
<qrcode-capture @detect="onDetect" capture="user" ></qrcode-capture>
|
||||
@ -31,6 +31,11 @@
|
||||
</b-row>
|
||||
</b-container>
|
||||
</div>
|
||||
<b-alert v-show="scan" show variant="primary" class="pointer text-center">
|
||||
<span class="alert-text" @click="scan = false">
|
||||
<strong>{{ $t('form.cancel') }}</strong>
|
||||
</span>
|
||||
</b-alert>
|
||||
</b-alert>
|
||||
|
||||
<validation-observer v-slot="{ handleSubmit }" ref="formValidator">
|
||||
@ -274,6 +279,12 @@ export default {
|
||||
}
|
||||
</script>
|
||||
<style>
|
||||
.pointer {
|
||||
cursor: pointer;
|
||||
}
|
||||
.pointer:hover {
|
||||
background-color: #3c4d69;
|
||||
}
|
||||
video {
|
||||
max-height: 665px;
|
||||
max-width: 665px;
|
||||
|
||||
@ -73,14 +73,11 @@
|
||||
</b-collapse>
|
||||
</b-list-group-item>
|
||||
<b-list-group-item v-show="this.$route.path == '/overview'">
|
||||
<b-alert
|
||||
v-if="count < 5"
|
||||
show
|
||||
variant="secondary"
|
||||
v-html="$t('transaction.show_part', { count: count })"
|
||||
></b-alert>
|
||||
<b-alert v-if="count < 5" show variant="secondary">
|
||||
<span class="alert-text" v-html="$t('transaction.show_part', { count: count })"></span>
|
||||
</b-alert>
|
||||
<router-link
|
||||
else
|
||||
v-else
|
||||
to="/transactions"
|
||||
v-html="$t('transaction.show_all', { count: count })"
|
||||
></router-link>
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<li class="nav-item d-sm-none"></li>
|
||||
</b-navbar-nav>
|
||||
<b-navbar-nav class="align-items-center ml-auto ml-md-0">
|
||||
<a class="pr-1" slot="title-container">
|
||||
<a class="pr-1 nav-link" slot="title-container" href>
|
||||
<b-media no-body class="align-items-center">
|
||||
<span class="pb-2 text-lg font-weight-bold">
|
||||
{{ $store.state.email }}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user