mirror of
https://github.com/misskey-dev/misskey.git
synced 2024-12-27 22:39:33 +09:00
Avoid roma-ji naming
This commit is contained in:
parent
b71a602107
commit
155da0c6a3
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="form">
|
||||
<header>
|
||||
<h1 v-html="$t('share-access', { name: app.name })"></h1>
|
||||
<h1 v-html="$t('share-access', { name })"></h1>
|
||||
<img :src="app.iconUrl"/>
|
||||
</header>
|
||||
<div class="app">
|
||||
@ -42,6 +42,11 @@ export default Vue.extend({
|
||||
i18n: i18n('auth/views/form.vue'),
|
||||
props: ['session'],
|
||||
computed: {
|
||||
name(): string {
|
||||
const el = document.createElement('div');
|
||||
el.textContent = this.app.name
|
||||
return el.innerHTML;
|
||||
},
|
||||
app(): any {
|
||||
return this.session.app;
|
||||
}
|
||||
|
@ -19,7 +19,7 @@
|
||||
<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="emoji.url" :alt="emoji.emoji"/></span>
|
||||
<span class="emoji" v-else-if="!useOsDefaultEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
|
||||
<span class="emoji" v-else>{{ emoji.emoji }}</span>
|
||||
<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
|
||||
<span class="name">{{ beforeQ }}<b>{{ q }}</b>{{ afterQ }}</span>
|
||||
<span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span>
|
||||
</li>
|
||||
</ol>
|
||||
@ -89,6 +89,14 @@ export default Vue.extend({
|
||||
},
|
||||
|
||||
computed: {
|
||||
beforeQ(): string {
|
||||
return this.emoji.name.split(this.q)[0];
|
||||
},
|
||||
|
||||
afterQ(): string {
|
||||
return this.emoji.name.split(this.q)[1] || '';
|
||||
},
|
||||
|
||||
items(): HTMLCollection {
|
||||
return (this.$refs.suggests as Element).children;
|
||||
},
|
||||
|
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="onchrpzrvnoruiaenfcqvccjfuupzzwv" :class="{ isMobile: $root.isMobile }">
|
||||
<div class="backdrop" ref="backdrop" @click="close"></div>
|
||||
<div class="popover" :class="{ hukidasi }" ref="popover">
|
||||
<div class="popover" :class="{ bubble }" ref="popover">
|
||||
<template v-for="item, i in items">
|
||||
<div v-if="item === null"></div>
|
||||
<button v-if="item" @click="clicked(item.action)" :tabindex="i">
|
||||
@ -28,7 +28,7 @@ export default Vue.extend({
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
hukidasi: !this.$root.isMobile
|
||||
bubble: !this.$root.isMobile
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
@ -56,12 +56,12 @@ export default Vue.extend({
|
||||
|
||||
if (left + width - window.pageXOffset > window.innerWidth) {
|
||||
left = window.innerWidth - width + window.pageXOffset;
|
||||
this.hukidasi = false;
|
||||
this.bubble = false;
|
||||
}
|
||||
|
||||
if (top + height - window.pageYOffset > window.innerHeight) {
|
||||
top = window.innerHeight - height + window.pageYOffset;
|
||||
this.hukidasi = false;
|
||||
this.bubble = false;
|
||||
}
|
||||
|
||||
if (top < 0) {
|
||||
@ -150,7 +150,7 @@ export default Vue.extend({
|
||||
|
||||
$balloon-size = 16px
|
||||
|
||||
&.hukidasi
|
||||
&.bubble
|
||||
margin-top $balloon-size
|
||||
transform-origin center -($balloon-size)
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
<div class="weekday"
|
||||
v-for="(day, i) in Array(7).fill(0)"
|
||||
:data-today="year == today.getFullYear() && month == today.getMonth() + 1 && today.getDay() == i"
|
||||
:data-is-donichi="i == 0 || i == 6"
|
||||
:data-is-weekend="i == 0 || i == 6"
|
||||
>{{ weekdayText[i] }}</div>
|
||||
</template>
|
||||
<div v-for="n in paddingDays"></div>
|
||||
@ -19,7 +19,7 @@
|
||||
:data-today="isToday(i + 1)"
|
||||
:data-selected="isSelected(i + 1)"
|
||||
:data-is-out-of-range="isOutOfRange(i + 1)"
|
||||
:data-is-donichi="isDonichi(i + 1)"
|
||||
:data-is-weekend="isWeekend(i + 1)"
|
||||
@click="go(i + 1)"
|
||||
:title="isOutOfRange(i + 1) ? null : $t('go')"
|
||||
>
|
||||
@ -96,7 +96,7 @@ export default Vue.extend({
|
||||
(this.start ? test < (this.start as any).getTime() : false);
|
||||
},
|
||||
|
||||
isDonichi(day) {
|
||||
isWeekend(day) {
|
||||
const weekday = (new Date(this.year, this.month - 1, day)).getDay();
|
||||
return weekday == 0 || weekday == 6;
|
||||
},
|
||||
@ -199,14 +199,14 @@ export default Vue.extend({
|
||||
&.weekday
|
||||
color var(--calendarWeek)
|
||||
|
||||
&[data-is-donichi]
|
||||
&[data-is-weekend]
|
||||
color var(--calendarSaturdayOrSunday)
|
||||
|
||||
&[data-today]
|
||||
box-shadow 0 0 0 var(--lineWidth) var(--calendarWeek) inset
|
||||
border-radius 6px
|
||||
|
||||
&[data-is-donichi]
|
||||
&[data-is-weekend]
|
||||
box-shadow 0 0 0 var(--lineWidth) var(--calendarSaturdayOrSunday) inset
|
||||
|
||||
&.day
|
||||
@ -222,7 +222,7 @@ export default Vue.extend({
|
||||
&:active > div
|
||||
background var(--faceClearButtonActive)
|
||||
|
||||
&[data-is-donichi]
|
||||
&[data-is-weekend]
|
||||
color var(--calendarSaturdayOrSunday)
|
||||
|
||||
&[data-is-out-of-range]
|
||||
|
Loading…
Reference in New Issue
Block a user