moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '547' into 'develop' 

Fix "Delete account modal partially hidden" issue

Closes #547

See merge request pleroma/pleroma-fe!803
This commit is contained in:
kaniini 2019-06-08 17:40:15 +00:00
parent 0ecf23881d 9c8af14908
commit 33554e8d1d
6 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -25,6 +25,7 @@
"object-path": "^0.11.3", "object-path": "^0.11.3",
"phoenix": "^1.3.0", "phoenix": "^1.3.0",
"popper.js": "^1.14.7", "popper.js": "^1.14.7",
"portal-vue": "^2.1.4",
"sanitize-html": "^1.13.0", "sanitize-html": "^1.13.0",
"v-click-outside": "^2.1.1", "v-click-outside": "^2.1.1",
"vue": "^2.5.13", "vue": "^2.5.13",

1
src/App.vue
View File

@ -49,6 +49,7 @@
</div> </div>
<chat-panel :floating="true" v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel> <chat-panel :floating="true" v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel>
<UserReportingModal /> <UserReportingModal />
<portal-target name="modal" />
</div> </div>
</template> </template>

2
src/components/dialog_modal/dialog_modal.vue
View File

@ -62,6 +62,7 @@
.title { .title {
margin-bottom: 0; margin-bottom: 0;
text-align: center;
} }
} }
@ -80,6 +81,7 @@
background-color: var(--lightBg, $fallback--lightBg); background-color: var(--lightBg, $fallback--lightBg);
border-top: 1px solid $fallback--bg; border-top: 1px solid $fallback--bg;
border-top: 1px solid var(--bg, $fallback--bg); border-top: 1px solid var(--bg, $fallback--bg);
display: flex;
justify-content: flex-end; justify-content: flex-end;
button { button {

26
src/components/moderation_tools/moderation_tools.vue
View File

@ -65,18 +65,20 @@
{{ $t('user_card.admin_menu.moderation') }} {{ $t('user_card.admin_menu.moderation') }}
</button> </button>
</Popper> </Popper>
<DialogModal v-if="showDeleteUserDialog" :onCancel='deleteUserDialog.bind(this, false)'> <portal to="modal">
<span slot="header">{{ $t('user_card.admin_menu.delete_user') }}</span> <DialogModal v-if="showDeleteUserDialog" :onCancel='deleteUserDialog.bind(this, false)'>
<p>{{ $t('user_card.admin_menu.delete_user_confirmation') }}</p> <template slot="header">{{ $t('user_card.admin_menu.delete_user') }}</template>
<span slot="footer"> <p>{{ $t('user_card.admin_menu.delete_user_confirmation') }}</p>
<button @click='deleteUserDialog(false)'> <template slot="footer">
{{ $t('general.cancel') }} <button class="btn btn-default" @click='deleteUserDialog(false)'>
</button> {{ $t('general.cancel') }}
<button class="danger" @click='deleteUser()'> </button>
{{ $t('user_card.admin_menu.delete_user') }} <button class="btn btn-default danger" @click='deleteUser()'>
</button> {{ $t('user_card.admin_menu.delete_user') }}
</span> </button>
</DialogModal> </template>
</DialogModal>
</portal>
</div> </div>
</template> </template>

2
src/main.js
View File

@ -24,6 +24,7 @@ import messages from './i18n/messages.js'
import VueChatScroll from 'vue-chat-scroll' import VueChatScroll from 'vue-chat-scroll'
import VueClickOutside from 'v-click-outside' import VueClickOutside from 'v-click-outside'
import PortalVue from 'portal-vue'
import afterStoreSetup from './boot/after_store.js' import afterStoreSetup from './boot/after_store.js'
@ -42,6 +43,7 @@ Vue.use(VueTimeago, {
Vue.use(VueI18n) Vue.use(VueI18n)
Vue.use(VueChatScroll) Vue.use(VueChatScroll)
Vue.use(VueClickOutside) Vue.use(VueClickOutside)
Vue.use(PortalVue)
const i18n = new VueI18n({ const i18n = new VueI18n({
// By default, use the browser locale, we will update it if neccessary // By default, use the browser locale, we will update it if neccessary

4
yarn.lock
View File

@ -6101,6 +6101,10 @@ popper.js@^1.14.7:
version "1.14.7" version "1.14.7"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e"
portal-vue@^2.1.4:
version "2.1.4"
resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.4.tgz#1fc679d77e294dc8d026f1eb84aa467de11b392e"
posix-character-classes@^0.1.0: posix-character-classes@^0.1.0:
version "0.1.1" version "0.1.1"
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"