diff options
| author | Tarteka <info@tarteka.net> | 2019-10-30 22:17:19 +0100 |
|---|---|---|
| committer | Tarteka <info@tarteka.net> | 2019-10-30 22:17:19 +0100 |
| commit | fe4845a7c1ca9d6fa51132a0ef9bc5103facae66 (patch) | |
| tree | 92aceb88e58d149a5446e5a9d7bca6084cb6fa99 /src/components/user_reporting_modal | |
| parent | a178346f1e0fbe2246532bbfeba5fd1cc0c1cb2d (diff) | |
| parent | 74f5f168d639e9e21e294ac45dd6091694a041cc (diff) | |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop
Diffstat (limited to 'src/components/user_reporting_modal')
| -rw-r--r-- | src/components/user_reporting_modal/user_reporting_modal.js | 4 | ||||
| -rw-r--r-- | src/components/user_reporting_modal/user_reporting_modal.vue | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js index 7c6ea409..833fa98a 100644 --- a/src/components/user_reporting_modal/user_reporting_modal.js +++ b/src/components/user_reporting_modal/user_reporting_modal.js @@ -2,12 +2,14 @@ import Status from '../status/status.vue' import List from '../list/list.vue' import Checkbox from '../checkbox/checkbox.vue' +import Modal from '../modal/modal.vue' const UserReportingModal = { components: { Status, List, - Checkbox + Checkbox, + Modal }, data () { return { diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue index c79a3707..6ee53461 100644 --- a/src/components/user_reporting_modal/user_reporting_modal.vue +++ b/src/components/user_reporting_modal/user_reporting_modal.vue @@ -1,13 +1,9 @@ <template> - <div + <Modal v-if="isOpen" - class="modal-view" - @click="closeModal" + @backdropClicked="closeModal" > - <div - class="user-reporting-panel panel" - @click.stop="" - > + <div class="user-reporting-panel panel"> <div class="panel-heading"> <div class="title"> {{ $t('user_reporting.title', [user.screen_name]) }} @@ -69,7 +65,7 @@ </div> </div> </div> - </div> + </Modal> </template> <script src="./user_reporting_modal.js"></script> |