worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse source
This commit is contained in:
NoriDev 2023-06-01 18:57:41 +09:00
parent fee38bf0db 861bfa06a8
commit 36ac2f2e28
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
packages/frontend/src/ui/deck/column.vue
View file

@ -24,6 +24,9 @@
<template v-else><i class="ti ti-chevron-down"></i></template> <template v-else><i class="ti ti-chevron-down"></i></template>
</button> </button>
<span :class="$style.title"><slot name="header"></slot></span> <span :class="$style.title"><slot name="header"></slot></span>
<svg viewBox="0 0 16 16" version="1.1" :class="$style.grabber">
<path fill="currentColor" d="M10 13a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm0-4a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm-4 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm5-9a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM7 8a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM6 5a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"></path>
</svg>
<button v-tooltip="i18n.ts.settings" :class="$style.menu" class="_button" @click.stop="showSettingsMenu"><i class="ti ti-dots"></i></button> <button v-tooltip="i18n.ts.settings" :class="$style.menu" class="_button" @click.stop="showSettingsMenu"><i class="ti ti-dots"></i></button>
</header> </header>
<div v-if="active" ref="body" :class="$style.body"> <div v-if="active" ref="body" :class="$style.body">
@ -364,23 +367,24 @@ function onDrop(ev) {
z-index: 1; z-index: 1;
width: var(--deckColumnHeaderHeight); width: var(--deckColumnHeaderHeight);
line-height: var(--deckColumnHeaderHeight); line-height: var(--deckColumnHeaderHeight);
color: var(--faceTextButton);
&:hover {
color: var(--faceTextButtonHover);
}
&:active {
color: var(--faceTextButtonActive);
}
} }
.toggleActive { .toggleActive {
margin-left: -16px; margin-left: -16px;
} }
.menu { .grabber {
margin-left: auto; margin-left: auto;
margin-right: 10px;
padding: 8px 8px;
box-sizing: border-box;
height: var(--deckColumnHeaderHeight);
cursor: move;
user-select: none;
opacity: 0.7;
}
.menu {
margin-right: -16px; margin-right: -16px;
} }