diff options
| author | Greta <gretadoci@gmail.com> | 2022-05-09 15:01:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 15:01:34 +0300 |
| commit | bbe8cb81b44a34c770b7db3ef7c555ff7945329a (patch) | |
| tree | 4ec9d5a407cc005d05bdd1b7cc01a107a9147053 /src | |
| parent | 2c526c834f6ee02f4d5145efddf455d667f57abd (diff) | |
| parent | fa7eb0e561eb4f6677635e7c74389fbf7d5a8ba6 (diff) | |
Merge pull request #6385 from nextcloud/enh/6265/move-mailvelope-to-app-settings
Move mailvelope hint from composer to app settings
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/AppSettingsMenu.vue | 24 | ||||
| -rw-r--r-- | src/components/Composer.vue | 10 |
2 files changed, 23 insertions, 11 deletions
diff --git a/src/components/AppSettingsMenu.vue b/src/components/AppSettingsMenu.vue index 235b14b30..0213fa0a9 100644 --- a/src/components/AppSettingsMenu.vue +++ b/src/components/AppSettingsMenu.vue @@ -73,6 +73,18 @@ {{ t('mail', 'Show keyboard shortcuts') }} </button> <KeyboardShortcuts v-if="displayKeyboardShortcuts" @close="closeKeyboardShortcuts" /> + + <p class="mailvelope-section"> + {{ t('mail', 'Looking for a way to encrypt your emails?') }} + + <a + class="icon-password button app-settings-button" + href="https://www.mailvelope.com/" + target="_blank" + rel="noopener noreferrer"> + {{ t('mail', 'Install Mailvelope browser extension') }} + </a> + </p> </div> </template> @@ -207,7 +219,7 @@ export default { } </script> -<style scoped> +<style lang="scss" scoped> p.app-settings span.icon-loading-small { display: inline-block; vertical-align: middle; @@ -229,4 +241,14 @@ p.app-settings { .app-settings-link { text-decoration: underline; } +.mailvelope-section { + padding-top: 15px; + + a.button { + display: flex; + align-items: center; + line-height: normal; + min-height: 34px; + } +} </style> diff --git a/src/components/Composer.vue b/src/components/Composer.vue index 0bfa00c75..140728452 100644 --- a/src/components/Composer.vue +++ b/src/components/Composer.vue @@ -224,14 +224,6 @@ @uncheck="encrypt = false"> {{ t('mail', 'Encrypt message with Mailvelope') }} </ActionCheckbox> - <ActionLink v-else - href="https://www.mailvelope.com/" - target="_blank" - icon="icon-password"> - {{ - t('mail', 'Looking for a way to encrypt your emails? Install the Mailvelope browser extension!') - }} - </ActionLink> </template> <template v-if="isMoreActionsOpen"> <ActionButton :close-after-click="false" @@ -357,7 +349,6 @@ import Actions from '@nextcloud/vue/dist/Components/Actions' import ActionButton from '@nextcloud/vue/dist/Components/ActionButton' import ActionCheckbox from '@nextcloud/vue/dist/Components/ActionCheckbox' import ActionInput from '@nextcloud/vue/dist/Components/ActionInput' -import ActionLink from '@nextcloud/vue/dist/Components/ActionLink' import ActionRadio from '@nextcloud/vue/dist/Components/ActionRadio' import Button from '@nextcloud/vue/dist/Components/Button' import ChevronLeft from 'vue-material-design-icons/ChevronLeft' @@ -417,7 +408,6 @@ export default { ActionButton, ActionCheckbox, ActionInput, - ActionLink, ActionRadio, VButton: Button, ComposerAttachments, |