lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Open the E2EE popout over the button

This commit is contained in:
Samuel Elliott 2018-08-23 20:38:48 +01:00
parent 3ba90705ff
commit 74d5d3540f
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/builtin/E2EEComponent.vue
View File

@ -10,7 +10,7 @@
<template>
<div class="bd-e2eeTaContainer">
<v-popover popoverClass="bd-popover bd-e2eePopover" placement="top">
<v-popover popoverClass="bd-popover bd-e2eePopover" placement="top-start">
<div v-if="error" class="bd-e2eeTaBtn bd-e2eeLock bd-error">
<MiLock v-tooltip="error" />
</div>
@ -27,9 +27,9 @@
</div>
<template slot="popover">
<div @click="toggleEncrypt" :class="{'bd-warn': !E2EE.encryptNewMessages, 'bd-ok': E2EE.encryptNewMessages}"><MiLock size="16" v-tooltip="'Toggle Encryption'" /></div>
<div v-close-popover @click="showUploadDialog" v-if="!error"><MiImagePlus size="16" v-tooltip="'Upload Encrypted Image'" /></div>
<div v-close-popover @click="generatePublicKey" v-if="DiscordApi.currentChannel.type === 'DM'"><MiIcVpnKey size="16" v-tooltip="'Begin Key Exchange'" /></div>
<div @click="toggleEncrypt" :class="{'bd-warn': !E2EE.encryptNewMessages, 'bd-ok': E2EE.encryptNewMessages}"><MiLock v-tooltip="'Toggle Encryption'" /></div>
<div v-close-popover @click="showUploadDialog" v-if="!error"><MiImagePlus v-tooltip="'Upload Encrypted Image'" /></div>
<div v-close-popover @click="generatePublicKey" v-if="DiscordApi.currentChannel.type === 'DM'"><MiIcVpnKey v-tooltip="'Begin Key Exchange'" /></div>
</template>
</v-popover>
<div class="bd-taDivider"></div>

7
client/src/styles/partials/bdsettings/e2ee.scss
View File

@ -108,8 +108,7 @@
.bd-e2eePopover {
background: #484b51;
margin: 0;
margin-top: 15px;
transform: translate(-2px, 52px);
.bd-ok {
svg {
@ -123,9 +122,7 @@
}
}
.bd-popoverWrapper,
.bd-popoverWrapper {
.bd-popoverInner,
.bd-popoverInner {
display: flex;
@ -141,7 +138,6 @@
}
}
.bd-materialDesignIcon,
.bd-materialDesignIcon {
display: flex;
fill: #7e8084;
@ -154,7 +150,6 @@
}
}
.bd-popoverArrow,
.bd-popoverArrow {
display: none;
}