From aa4136da5b6691e3fe0e8da28df2d702ca030d1f Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 11 May 2023 20:43:00 -0400
Subject: [PATCH] fix

---
 packages/client/src/components/MkNotes.vue |   2 +-
 packages/client/src/ui/classic.sidebar.vue | 409 ---------------------
 2 files changed, 1 insertion(+), 410 deletions(-)
 delete mode 100644 packages/client/src/ui/classic.sidebar.vue

diff --git a/packages/client/src/components/MkNotes.vue b/packages/client/src/components/MkNotes.vue
index c62990ad28..bf3631c182 100644
--- a/packages/client/src/components/MkNotes.vue
+++ b/packages/client/src/components/MkNotes.vue
@@ -58,7 +58,7 @@ defineExpose({
 .giivymft {
 	&.noGap {
 		> .notes {
-			background: var(--panel);
+			background: var(--panel) !important;
 			border-radius: var(--radius);
 		}
 	}
diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
deleted file mode 100644
index fa72c5765d..0000000000
--- a/packages/client/src/ui/classic.sidebar.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<template>
-	<div class="npcljfve" :class="{ iconOnly }">
-		<button
-			v-click-anime
-			class="item _button account"
-			@click="openAccountMenu"
-		>
-			<MkAvatar :user="$i" class="avatar" disableLink /><MkAcct
-				class="text"
-				:user="$i"
-			/>
-		</button>
-		<div class="post" data-cy-open-post-form @click="post">
-			<MkButton class="button" gradate full rounded>
-				<i class="ph-pencil ph-bold ph-lg ph-fw ph-lg"></i
-				><span v-if="!iconOnly" class="text">{{ i18n.ts.note }}</span>
-			</MkButton>
-		</div>
-		<div class="divider"></div>
-		<MkA
-			v-click-anime
-			class="item index"
-			active-class="active"
-			to="/"
-			exact
-		>
-			<i class="ph-house ph-bold ph-lg ph-fw ph-lg"></i
-			><span class="text">{{ i18n.ts.timeline }}</span>
-		</MkA>
-		<template v-for="item in menu">
-			<div v-if="item === '-'" class="divider"></div>
-			<component
-				:is="navbarItemDef[item].to ? 'MkA' : 'button'"
-				v-else-if="
-					navbarItemDef[item] && navbarItemDef[item].show !== false
-				"
-				v-click-anime
-				class="item _button"
-				:class="item"
-				active-class="active"
-				:to="navbarItemDef[item].to"
-				v-on="
-					navbarItemDef[item].action
-						? { click: navbarItemDef[item].action }
-						: {}
-				"
-			>
-				<i class="ph-fw ph-lg" :class="navbarItemDef[item].icon"></i
-				><span class="text">{{ $ts[navbarItemDef[item].title] }}</span>
-				<span v-if="navbarItemDef[item].indicated" class="indicator"
-					><i class="ph-circle ph-fill"></i
-				></span>
-			</component>
-		</template>
-		<div class="divider"></div>
-		<MkA
-			v-if="$i.isAdmin || $i.isModerator"
-			v-click-anime
-			class="item"
-			active-class="active"
-			to="/admin"
-			:behavior="settingsWindowed ? 'modalWindow' : null"
-		>
-			<i class="ph-door ph-bold ph-lg ph-fw ph-lg"></i
-			><span class="text">{{ i18n.ts.controlPanel }}</span>
-		</MkA>
-		<button v-click-anime class="item _button" @click="more">
-			<i class="ph-dots-three-outline ph-bold ph-lg ph-fw ph-lg"></i
-			><span class="text">{{ i18n.ts.more }}</span>
-			<span v-if="otherNavItemIndicated" class="indicator"
-				><i class="ph-circle ph-fill"></i
-			></span>
-		</button>
-		<MkA
-			v-click-anime
-			class="item"
-			active-class="active"
-			to="/settings"
-			:behavior="settingsWindowed ? 'modalWindow' : null"
-		>
-			<i class="ph-gear-six ph-bold ph-lg ph-fw ph-lg"></i
-			><span class="text">{{ i18n.ts.settings }}</span>
-		</MkA>
-		<div class="divider"></div>
-		<div class="about">
-			<MkA v-click-anime class="link" @click="openInstanceMenu">
-				<img
-					:src="
-						$instance.iconUrl ||
-						$instance.faviconUrl ||
-						'/favicon.ico'
-					"
-					class="_ghost"
-				/>
-			</MkA>
-		</div>
-		<!--<MisskeyLogo class="misskey"/>-->
-	</div>
-</template>
-
-<script lang="ts">
-import { defineAsyncComponent, defineComponent } from "vue";
-import { host } from "@/config";
-import { search } from "@/scripts/search";
-import * as os from "@/os";
-import { navbarItemDef } from "@/navbar";
-import { openAccountMenu } from "@/account";
-import MkButton from "@/components/MkButton.vue";
-import { StickySidebar } from "@/scripts/sticky-sidebar";
-//import MisskeyLogo from '@assets/client/misskey.svg';
-import { i18n } from "@/i18n";
-
-export default defineComponent({
-	components: {
-		MkButton,
-		//MisskeyLogo,
-	},
-
-	data() {
-		return {
-			host: host,
-			accounts: [],
-			connection: null,
-			navbarItemDef: navbarItemDef,
-			iconOnly: false,
-			settingsWindowed: false,
-			i18n,
-		};
-	},
-
-	computed: {
-		menu(): string[] {
-			return this.$store.state.menu;
-		},
-
-		otherNavItemIndicated(): boolean {
-			for (const def in this.navbarItemDef) {
-				if (this.menu.includes(def)) continue;
-				if (this.navbarItemDef[def].indicated) return true;
-			}
-			return false;
-		},
-	},
-
-	watch: {
-		"$store.reactiveState.menuDisplay.value"() {
-			this.calcViewState();
-		},
-
-		iconOnly() {
-			this.$nextTick(() => {
-				this.$emit("change-view-mode");
-			});
-		},
-	},
-
-	created() {
-		window.addEventListener("resize", this.calcViewState);
-		this.calcViewState();
-	},
-
-	mounted() {
-		const sticky = new StickySidebar(this.$el.parentElement, 16);
-		window.addEventListener(
-			"scroll",
-			() => {
-				sticky.calc(window.scrollY);
-			},
-			{ passive: true }
-		);
-	},
-
-	methods: {
-		calcViewState() {
-			this.iconOnly =
-				window.innerWidth <= 1400 ||
-				this.$store.state.menuDisplay === "sideIcon";
-			this.settingsWindowed = window.innerWidth > 1400;
-		},
-
-		post() {
-			os.post();
-		},
-
-		search() {
-			search();
-		},
-
-		more(ev) {
-			os.popup(
-				defineAsyncComponent(
-					() => import("@/components/MkLaunchPad.vue")
-				),
-				{
-					src: ev.currentTarget ?? ev.target,
-				},
-				{},
-				"closed"
-			);
-		},
-
-		openAccountMenu: (ev) => {
-			openAccountMenu(
-				{
-					withExtraOperation: true,
-				},
-				ev
-			);
-		},
-	},
-});
-
-function openInstanceMenu(ev: MouseEvent) {
-	os.popupMenu(
-		[
-			{
-				text: instance.name ?? host,
-				type: "label",
-			},
-			{
-				type: "link",
-				text: i18n.ts.instanceInfo,
-				icon: "ph-info ph-bold ph-lg",
-				to: "/about",
-			},
-			null,
-			{
-				type: "parent",
-				text: i18n.ts.help,
-				icon: "ph-question ph-bold ph-lg",
-				children: [
-					{
-						type: "link",
-						to: "/mfm-cheat-sheet",
-						text: i18n.ts._mfm.cheatSheet,
-						icon: "ph-code ph-bold ph-lg",
-					},
-					{
-						type: "link",
-						to: "/scratchpad",
-						text: i18n.ts.scratchpad,
-						icon: "ph-terminal-window ph-bold ph-lg",
-					},
-					{
-						type: "link",
-						to: "/api-console",
-						text: "API Console",
-						icon: "ph-terminal-window ph-bold ph-lg",
-					},
-					null,
-					{
-						text: i18n.ts.document,
-						icon: "ph-question ph-bold ph-lg",
-						action: () => {
-							window.open(
-								"https://misskey-hub.net/help.html",
-								"_blank"
-							);
-						},
-					},
-				],
-			},
-			{
-				type: "link",
-				text: i18n.ts.aboutMisskey,
-				to: "/about-calckey",
-			},
-		],
-		ev.currentTarget ?? ev.target,
-		{
-			align: "left",
-		}
-	);
-}
-</script>
-
-<style lang="scss" scoped>
-.npcljfve {
-	$ui-font-size: 1em; // TODO: どこかに集約したい
-	$nav-icon-only-width: 78px; // TODO: どこかに集約したい
-	$avatar-size: 32px;
-	$avatar-margin: 8px;
-
-	padding: 0 16px;
-	box-sizing: border-box;
-	width: 260px;
-
-	&.iconOnly {
-		flex: 0 0 $nav-icon-only-width;
-		width: $nav-icon-only-width !important;
-
-		> .divider {
-			margin: 8px auto;
-			width: calc(100% - 32px);
-		}
-
-		> .post {
-			> .button {
-				width: 46px;
-				height: 46px;
-				padding: 0;
-				margin-inline: 0 !important;
-			}
-		}
-
-		> .item {
-			padding-left: 0;
-			width: 100%;
-			text-align: center;
-			font-size: $ui-font-size * 1.1;
-			line-height: 3.7rem;
-
-			> i,
-			> .avatar {
-				margin-right: 0;
-			}
-
-			> i {
-				left: 10px;
-			}
-
-			> .text {
-				display: none;
-			}
-		}
-	}
-
-	> .divider {
-		margin: 10px 0;
-		border-top: solid 0.5px var(--divider);
-	}
-
-	> .post {
-		position: sticky;
-		top: 0;
-		z-index: 1;
-		padding: 16px 0;
-		background: var(--bg);
-
-		> .button {
-			min-width: 0;
-		}
-	}
-
-	> .about {
-		fill: currentColor;
-		padding: 8px 0 16px 0;
-		text-align: center;
-
-		> .link {
-			display: block;
-			width: 32px;
-			margin: 0 auto;
-
-			img {
-				display: block;
-				width: 100%;
-			}
-		}
-	}
-
-	> .item {
-		position: relative;
-		display: block;
-		font-size: $ui-font-size;
-		line-height: 2.6rem;
-		text-overflow: ellipsis;
-		overflow: hidden;
-		white-space: nowrap;
-		width: 100%;
-		text-align: left;
-		box-sizing: border-box;
-
-		> i {
-			width: 32px;
-			justify-content: center;
-		}
-
-		> i,
-		> .avatar {
-			margin-right: $avatar-margin;
-		}
-
-		> .avatar {
-			width: $avatar-size;
-			height: $avatar-size;
-			vertical-align: middle;
-		}
-
-		> .indicator {
-			position: absolute;
-			top: 0;
-			left: 0;
-			color: var(--navIndicator);
-			font-size: 8px;
-			animation: blink 1s infinite;
-		}
-
-		&:hover {
-			text-decoration: none;
-			color: var(--navHoverFg);
-		}
-
-		&.active {
-			color: var(--navActive);
-		}
-	}
-}
-</style>