Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-dev/develop' into io

Browse source
This commit is contained in:
まっちゃとーにゅ 2024-01-23 04:10:51 +09:00
commit 8aa76868b3
No known key found for this signature in database
GPG key ID: 143DE582A97FE052
266 changed files with 20375 additions and 6619 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/ui/_common_/navbar-for-mobile.vue
View file

@ -254,7 +254,7 @@ function more() {
left: 20px;
color: var(--navIndicator);
font-size: 8px;
animation: blink 1s infinite;
animation: global-blink 1s infinite;
&:has(.itemIndicateValueIcon) {
animation: none;

4
packages/frontend/src/ui/_common_/navbar.vue
View file

@ -313,7 +313,7 @@ function more(ev: MouseEvent) {
left: 20px;
color: var(--navIndicator);
font-size: 8px;
animation: blink 1s infinite;
animation: global-blink 1s infinite;
&:has(.itemIndicateValueIcon) {
animation: none;
@ -483,7 +483,7 @@ function more(ev: MouseEvent) {
left: 24px;
color: var(--navIndicator);
font-size: 8px;
animation: blink 1s infinite;
animation: global-blink 1s infinite;
&:has(.itemIndicateValueIcon) {
animation: none;

2
packages/frontend/src/ui/classic.header.vue
View file

@ -141,7 +141,7 @@ onMounted(() => {
left: 0;
color: var(--navIndicator);
font-size: 8px;
animation: blink 1s infinite;
animation: global-blink 1s infinite;
}
&:hover {

2
packages/frontend/src/ui/classic.sidebar.vue
View file

@ -220,7 +220,7 @@ watch(defaultStore.reactiveState.menuDisplay, () => {
left: 0;
color: var(--navIndicator);
font-size: 8px;
animation: blink 1s infinite;
animation: global-blink 1s infinite;
&:has(.itemIndicateValueIcon) {
animation: none;

8
packages/frontend/src/ui/deck.vue
View file

@ -189,7 +189,7 @@ const addColumn = async (ev) => {
const { canceled, result: column } = await os.select({
title: i18n.ts._deck.addColumn,
items: columns.map(column => ({
value: column, text: i18n.t('_deck._columns.' + column),
value: column, text: i18n.ts._deck._columns[column],
})),
});
if (canceled) return;
@ -197,7 +197,7 @@ const addColumn = async (ev) => {
addColumnToStore({
type: column,
id: uuid(),
name: i18n.t('_deck._columns.' + column),
name: i18n.ts._deck._columns[column],
width: 330,
});
};
@ -256,7 +256,7 @@ function changeProfile(ev: MouseEvent) {
async function deleteProfile() {
const { canceled } = await os.confirm({
type: 'warning',
text: i18n.t('deleteAreYouSure', { x: deckStore.state.profile }),
text: i18n.tsx.deleteAreYouSure({ x: deckStore.state.profile }),
});
if (canceled) return;
@ -488,7 +488,7 @@ body {
left: 0;
color: var(--indicator);
font-size: 16px;
animation: blink 1s infinite;
animation: global-blink 1s infinite;
&:has(.itemIndicateValueIcon) {
animation: none;

2
packages/frontend/src/ui/universal.vue
View file

@ -448,7 +448,7 @@ $widgets-hide-threshold: 1090px;
left: 0;
color: var(--indicator);
font-size: 16px;
animation: blink 1s infinite;
animation: global-blink 1s infinite;
&:has(.itemIndicateValueIcon) {
animation: none;