Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
syuilo
commit
075df75afa
|
|
@ -3182,7 +3182,7 @@ drafts: "Esborrany "
|
|||
_drafts:
|
||||
select: "Seleccionar esborrany"
|
||||
cannotCreateDraftAnymore: "S'ha sobrepassat el nombre màxim d'esborranys que es poden crear."
|
||||
cannotCreateDraftOfRenote: "No es poden crear esborranys de remotes."
|
||||
cannotCreateDraft: "Amb aquest contingut no es poden crear esborranys."
|
||||
delete: "Esborrar esborranys"
|
||||
deleteAreYouSure: "Vols esborrar els esborranys?"
|
||||
noDrafts: "No hi ha esborranys"
|
||||
|
|
|
|||
|
|
@ -3182,7 +3182,6 @@ drafts: "Drafts"
|
|||
_drafts:
|
||||
select: "Select Draft"
|
||||
cannotCreateDraftAnymore: "The number of drafts that can be created has been exceeded."
|
||||
cannotCreateDraftOfRenote: "You cannot create a draft of a renote."
|
||||
delete: "Delete Draft"
|
||||
deleteAreYouSure: "Delete draft?"
|
||||
noDrafts: "No drafts"
|
||||
|
|
|
|||
|
|
@ -3182,7 +3182,7 @@ drafts: "Borrador"
|
|||
_drafts:
|
||||
select: "Seleccionar borradores"
|
||||
cannotCreateDraftAnymore: "Se ha superado el número de borradores que se pueden crear."
|
||||
cannotCreateDraftOfRenote: "No se pueden crear borradores de renotas."
|
||||
cannotCreateDraft: "No se pueden crear borradores con este contenido."
|
||||
delete: "Eliminar borrador"
|
||||
deleteAreYouSure: "¿Quieres borrar el borrador?"
|
||||
noDrafts: "No hay borradores disponibles."
|
||||
|
|
|
|||
|
|
@ -5,9 +5,13 @@ introMisskey: "Selamat datang! Misskey adalah perangkat mikroblog tercatu bersif
|
|||
poweredByMisskeyDescription: "{name} adalah sebuah layanan (instance) yang menggunakan platform sumber terbuka <b>Misskey</b>."
|
||||
monthAndDay: "{day} {month}"
|
||||
search: "Penelusuran"
|
||||
reset: "Reset"
|
||||
notifications: "Notifikasi"
|
||||
username: "Nama Pengguna"
|
||||
password: "Kata sandi"
|
||||
initialPasswordForSetup: "Kata sandi untuk memulai konfigurasi awal"
|
||||
initialPasswordIsIncorrect: "Kata sandi untuk memulai konfigurasi awal salah."
|
||||
initialPasswordForSetupDescription: "Jika Anda menginstal Misskey sendiri, gunakan kata sandi yang Anda masukkan di berkas konfigurasi.\nJika Anda menggunakan layanan hosting Misskey, gunakan kata sandi yang diberikan.\nJika Anda belum mengatur kata sandi, biarkan kosong dan lanjutkan."
|
||||
forgotPassword: "Lupa Kata Sandi"
|
||||
fetchingAsApObject: "Mengambil data dari Fediverse..."
|
||||
ok: "OK"
|
||||
|
|
@ -45,6 +49,7 @@ pin: "Sematkan ke profil"
|
|||
unpin: "Lepas sematan dari profil"
|
||||
copyContent: "Salin konten"
|
||||
copyLink: "Salin tautan"
|
||||
copyRemoteLink: "Salin tautan jarak jauh"
|
||||
copyLinkRenote: "Salin tautan renote"
|
||||
delete: "Hapus"
|
||||
deleteAndEdit: "Hapus dan sunting"
|
||||
|
|
@ -212,8 +217,10 @@ perDay: "per Hari"
|
|||
stopActivityDelivery: "Berhenti mengirim aktivitas"
|
||||
blockThisInstance: "Blokir instansi ini"
|
||||
silenceThisInstance: "Senyapkan instansi ini"
|
||||
mediaSilenceThisInstance: "Server media senyap"
|
||||
operations: "Tindakan"
|
||||
software: "Perangkat lunak"
|
||||
softwareName: "Nama Perangkat Lunak"
|
||||
version: "Versi"
|
||||
metadata: "Metadata"
|
||||
withNFiles: "{n} berkas"
|
||||
|
|
@ -1040,7 +1047,7 @@ disableFederationConfirmWarn: "Mematikan federasi tidak membuat kiriman menjadi
|
|||
disableFederationOk: "Matikan federasi"
|
||||
invitationRequiredToRegister: "Instansi ini dalam mode undangan-saja. Kamu harus memasukkan kode undangan yang valid untuk mendaftar."
|
||||
emailNotSupported: "Instansi ini tidak mendukung mengirim surel"
|
||||
postToTheChannel: "Catat ke kanal"
|
||||
postToTheChannel: "Buat Catatan ke Kanal"
|
||||
cannotBeChangedLater: "Hal ini nantinya tidak dapat diubah lagi."
|
||||
reactionAcceptance: "Penerimaan reaksi"
|
||||
likeOnly: "Hanya suka"
|
||||
|
|
@ -2400,7 +2407,7 @@ _deck:
|
|||
main: "Utama"
|
||||
widgets: "Widget"
|
||||
notifications: "Notifikasi"
|
||||
tl: "Lini masa"
|
||||
tl: "Beranda"
|
||||
antenna: "Antena"
|
||||
list: "Daftar"
|
||||
channel: "Kanal"
|
||||
|
|
|
|||
|
|
@ -3182,7 +3182,6 @@ drafts: "초안"
|
|||
_drafts:
|
||||
select: "초안 선택"
|
||||
cannotCreateDraftAnymore: "초안 작성 가능 수를 초과했습니다."
|
||||
cannotCreateDraftOfRenote: "리노트 초안은 작성할 수 없습니다."
|
||||
delete: "초안 삭제\n"
|
||||
deleteAreYouSure: "초안을 삭제하시겠습니까?"
|
||||
noDrafts: "초안 없음\n"
|
||||
|
|
|
|||
|
|
@ -3182,6 +3182,5 @@ drafts: "Rascunhos"
|
|||
_drafts:
|
||||
select: "Selecionar Rascunho"
|
||||
cannotCreateDraftAnymore: "O número máximo de rascunhos foi excedido."
|
||||
cannotCreateDraftOfRenote: "Você não pode criar o rascunho de uma repostagem."
|
||||
delete: "Excluir Rascunho"
|
||||
restore: "Redefinir"
|
||||
|
|
|
|||
|
|
@ -3182,7 +3182,7 @@ drafts: "草稿"
|
|||
_drafts:
|
||||
select: "选择草稿"
|
||||
cannotCreateDraftAnymore: "已超过可创建的草稿数量。"
|
||||
cannotCreateDraftOfRenote: "无法创建转帖草稿。"
|
||||
cannotCreateDraft: "此内容无法创建草稿。"
|
||||
delete: "删除草稿"
|
||||
deleteAreYouSure: "要删除草稿吗？"
|
||||
noDrafts: "没有草稿"
|
||||
|
|
|
|||
|
|
@ -3182,7 +3182,7 @@ drafts: "草稿\n"
|
|||
_drafts:
|
||||
select: "選擇草槁"
|
||||
cannotCreateDraftAnymore: "已超出可建立的草稿數量上限。\n"
|
||||
cannotCreateDraftOfRenote: "無法建立轉發的草稿。\n"
|
||||
cannotCreateDraft: "無法以此內容建立草稿。\n"
|
||||
delete: "刪除草稿"
|
||||
deleteAreYouSure: "確定要刪除草稿嗎？\n"
|
||||
noDrafts: "沒有草稿。\n"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
|
||||
<script lang="ts" setup>
|
||||
import { computed } from 'vue';
|
||||
import tinycolor from 'tinycolor2';
|
||||
import { instanceName as localInstanceName } from '@@/js/config.js';
|
||||
import type { CSSProperties } from 'vue';
|
||||
import { instance as localInstance } from '@/instance.js';
|
||||
|
|
@ -44,33 +43,10 @@ const faviconUrl = computed(() => {
|
|||
return getProxiedImageUrlNullable(imageSrc);
|
||||
});
|
||||
|
||||
type ITickerColors = {
|
||||
readonly bg: string;
|
||||
readonly fg: string;
|
||||
};
|
||||
|
||||
const TICKER_YUV_THRESHOLD = 191 as const;
|
||||
const TICKER_FG_COLOR_LIGHT = '#ffffff' as const;
|
||||
const TICKER_FG_COLOR_DARK = '#2f2f2fcc' as const;
|
||||
|
||||
function getTickerColors(bgHex: string): ITickerColors {
|
||||
const tinycolorInstance = tinycolor(bgHex);
|
||||
const { r, g, b } = tinycolorInstance.toRgb();
|
||||
const yuv = 0.299 * r + 0.587 * g + 0.114 * b;
|
||||
const fgHex = yuv > TICKER_YUV_THRESHOLD ? TICKER_FG_COLOR_DARK : TICKER_FG_COLOR_LIGHT;
|
||||
|
||||
return {
|
||||
fg: fgHex,
|
||||
bg: bgHex,
|
||||
} as const satisfies ITickerColors;
|
||||
}
|
||||
|
||||
const themeColorStyle = computed<CSSProperties>(() => {
|
||||
const themeColor = (props.host == null ? localInstance.themeColor : props.instance?.themeColor) ?? '#777777';
|
||||
const colors = getTickerColors(themeColor);
|
||||
return {
|
||||
background: `linear-gradient(90deg, ${colors.bg}, ${colors.bg}00)`,
|
||||
color: colors.fg,
|
||||
background: `linear-gradient(90deg, ${themeColor}, ${themeColor}00)`,
|
||||
};
|
||||
});
|
||||
</script>
|
||||
|
|
@ -84,6 +60,7 @@ $height: 2ex;
|
|||
height: $height;
|
||||
border-radius: 4px 0 0 4px;
|
||||
overflow: clip;
|
||||
color: #fff;
|
||||
|
||||
// text-shadowは重いから使うな
|
||||
|
||||
|
|
@ -106,5 +83,10 @@ $height: 2ex;
|
|||
font-weight: bold;
|
||||
white-space: nowrap;
|
||||
overflow: visible;
|
||||
|
||||
// text-shadowは重いから使うな
|
||||
color: var(--MI_THEME-fg);
|
||||
-webkit-text-stroke: var(--MI_THEME-panel) .225em;
|
||||
paint-order: stroke fill;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue