logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 914b4eb5938f00284afff3c210dcafa94e48f510
parent 395e12cbc6e22459508023daabba87b62a65050e
Author: Henry Jameson <me@hjkos.com>
Date:   Mon,  8 Mar 2021 21:03:55 +0200

lint

Diffstat:

Msrc/components/settings_modal/settings_modal.js5++---
Msrc/components/settings_modal/settings_modal.vue8++++----
Msrc/components/settings_modal/tabs/theme_tab/theme_tab.vue10++++++++--
3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js @@ -99,7 +99,7 @@ const SettingsModal = { if (minor > PLEROMAFE_SETTINGS_MINOR_VERSION) { this.$store.dispatch('pushGlobalNotice', { level: 'warning', - messageKey: 'settings.file_export_import.errors.file_slightly_new', + messageKey: 'settings.file_export_import.errors.file_slightly_new' }) } @@ -113,8 +113,7 @@ const SettingsModal = { } }, onImport (data) { - if (data) - this.$store.dispatch('loadSettings', data) + if (data) { this.$store.dispatch('loadSettings', data) } }, restore () { console.log(this.dataImporter) diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue @@ -31,8 +31,8 @@ </transition> <button class="btn button-default" - @click="peekModal" :title="$t('general.peek')" + @click="peekModal" > <FAIcon :icon="['far', 'window-minimize']" @@ -41,8 +41,8 @@ </button> <button class="btn button-default" - @click="closeModal" :title="$t('general.close')" + @click="closeModal" > <FAIcon icon="times" @@ -61,12 +61,12 @@ :offset="{ y: 5, x: 5 }" :bound-to="{ x: 'container' }" remove-padding - > + > <button slot="trigger" class="btn button-default" :title="$t('general.close')" - > + > <span>{{ $t("settings.file_export_import.backup_restore") }}</span> <FAIcon icon="chevron-down" diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue @@ -79,10 +79,16 @@ </label> </div> <div class="export-import"> - <button class="btn button-default" @click="importTheme"> + <button + class="btn button-default" + @click="importTheme" + > {{ $t(&quot;settings.import_theme&quot;) }} </button> - <button class="btn button-default" @click="exportTheme"> + <button + class="btn button-default" + @click="exportTheme" + > {{ $t(&quot;settings.export_theme&quot;) }} </button> </div>