From ffbfe741e3a4c59e615821a1c675012f4037844c Mon Sep 17 00:00:00 2001
From: Marie <github@yuugi.dev>
Date: Thu, 8 May 2025 01:40:40 +0200
Subject: [PATCH] Fix missing icon, Fix import of all notes being outside all
 notes folder

---
 .../src/pages/settings/account-data.vue       | 43 ++++++++++---------
 packages/frontend/vite.replaceIcons.ts        |  2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/packages/frontend/src/pages/settings/account-data.vue b/packages/frontend/src/pages/settings/account-data.vue
index ee5d732f90..39476a393d 100644
--- a/packages/frontend/src/pages/settings/account-data.vue
+++ b/packages/frontend/src/pages/settings/account-data.vue
@@ -15,27 +15,28 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkFolder>
 					<template #icon><i class="ti ti-pencil"></i></template>
 					<template #label><SearchLabel>{{ i18n.ts._exportOrImport.allNotes }}</SearchLabel></template>
-					<MkFolder :defaultOpen="true">
-						<template #label>{{ i18n.ts.export }}</template>
-						<template #icon><i class="ti ti-download"></i></template>
-						<MkButton primary :class="$style.button" inline @click="exportNotes()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton>
-					</MkFolder>
-				</MkFolder>
-			</SearchMarker>
-
-			<SearchMarker :keywords="['notes', 'import']">
-				<MkFolder v-if="$i && $i.policies.canImportNotes">
-					<template #label><SearchLabel>{{ i18n.ts.import }}</SearchLabel></template>
-					<template #icon><i class="ph-upload ph-bold ph-lg"></i></template>
-					<MkRadios v-model="noteType" style="padding-bottom: 8px;" small>
-						<template #label>Origin</template>
-						<option value="Misskey">Misskey/Firefish</option>
-						<option value="Mastodon">Mastodon/Pleroma/Akkoma</option>
-						<option value="Twitter">Twitter</option>
-						<option value="Instagram">Instagram</option>
-						<option value="Facebook">Facebook</option>
-					</MkRadios>
-					<MkButton primary :class="$style.button" inline @click="importNotes($event)"><i class="ph-upload ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
+					<div class="_gaps_s">
+						<MkFolder :defaultOpen="true">
+							<template #label>{{ i18n.ts.export }}</template>
+							<template #icon><i class="ti ti-download"></i></template>
+							<MkButton primary :class="$style.button" inline @click="exportNotes()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton>
+						</MkFolder>
+						<SearchMarker :keywords="['notes', 'import']">
+							<MkFolder v-if="$i && $i.policies.canImportNotes">
+								<template #label><SearchLabel>{{ i18n.ts.import }}</SearchLabel></template>
+								<template #icon><i class="ph-upload ph-bold ph-lg"></i></template>
+								<MkRadios v-model="noteType" style="padding-bottom: 8px;" small>
+									<template #label>Origin</template>
+									<option value="Misskey">Misskey/Firefish</option>
+									<option value="Mastodon">Mastodon/Pleroma/Akkoma</option>
+									<option value="Twitter">Twitter</option>
+									<option value="Instagram">Instagram</option>
+									<option value="Facebook">Facebook</option>
+								</MkRadios>
+								<MkButton primary :class="$style.button" inline @click="importNotes($event)"><i class="ph-upload ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
+							</MkFolder>
+						</SearchMarker>
+					</div>
 				</MkFolder>
 			</SearchMarker>
 
diff --git a/packages/frontend/vite.replaceIcons.ts b/packages/frontend/vite.replaceIcons.ts
index 4165c98c8c..ce05fc7e7b 100644
--- a/packages/frontend/vite.replaceIcons.ts
+++ b/packages/frontend/vite.replaceIcons.ts
@@ -232,7 +232,7 @@ export function pluginReplaceIcons() {
 					'ti ti-external-link': 'ph-arrow-square-out ph-bold ph-lg',
 					'ti ti-eye': 'ph-eye ph-bold ph-lg',
 					'ti ti-eye-exclamation': 'ph-eye-slash ph-bold ph-lg',
-					'ti ti-eye-off': 'ti ti-eye-exclamation',
+					'ti ti-eye-off': 'ph-eye-slash ph-bold ph-lg',
 					'ti ti-feather': 'ph-feather ph-bold ph-lg',
 					'ti ti-file': 'ph-file ph-bold ph-lg',
 					'ti ti-file-invoice': 'ph-newspaper-clipping ph-bold ph-lg',