sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into sw-notification-action

Browse Source
This commit is contained in:
tamaina
2021-03-03 13:41:12 +09:00
parent 34e8ea58fb 7427b4c839
commit 35fe912e5f
88 changed files with 757 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/components/autocomplete.vue
View File

@@ -401,8 +401,7 @@ export default defineComponent({
z-index: 65535;
max-width: 100%;
margin-top: calc(1em + 8px);
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
transition: top 0.1s ease, left 0.1s ease;
> ol {
@@ -419,8 +418,7 @@ export default defineComponent({
align-items: center;
padding: 4px 12px;
white-space: nowrap;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
font-size: 0.9em;
cursor: default;
@@ -429,8 +427,7 @@ export default defineComponent({
}
* {
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
text-overflow: ellipsis;
}

3
src/client/components/channel-preview.vue
View File

@@ -66,8 +66,7 @@ export default defineComponent({
<style lang="scss" scoped>
.eftoefju {
display: block;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
width: 100%;
&:hover {

3
src/client/components/drive.file.vue
View File

@@ -342,8 +342,7 @@ export default defineComponent({
text-align: center;
word-break: break-all;
color: var(--fg);
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
> .ext {
opacity: 0.5;

7
src/client/components/emoji-picker.vue
View File

@@ -62,10 +62,6 @@
<header class="_acrylic">{{ $ts.emoji }}</header>
<XSection v-for="category in categories" :emojis="emojilist.filter(e => e.category === category).map(e => e.char)">{{ category }}</XSection>
</div>
<div>
<header class="_acrylic">{{ $ts.tags }}</header>
<XSection v-for="tag in emojiTags" :emojis="customEmojis.filter(e => e.aliases.includes(tag)).map(e => ':' + e.name + ':')">{{ tag }}</XSection>
</div>
</div>
<div class="tabs">
<button class="_button tab" :class="{ active: tab === 'index' }" @click="tab = 'index'"><Fa :icon="faAsterisk" fixed-width/></button>
@@ -86,7 +82,7 @@ import Particle from '@/components/particle.vue';
import * as os from '@/os';
import { isDeviceTouch } from '@/scripts/is-device-touch';
import { isMobile } from '@/scripts/is-mobile';
import { emojiCategories, emojiTags } from '@/instance';
import { emojiCategories } from '@/instance';
import XSection from './emoji-picker.section.vue';
export default defineComponent({
@@ -115,7 +111,6 @@ export default defineComponent({
height: this.asReactionPicker ? this.$store.state.reactionPickerHeight : 2,
big: this.asReactionPicker ? isDeviceTouch : false,
customEmojiCategories: emojiCategories,
emojiTags,
customEmojis: this.$instance.emojis,
q: null,
searchResultCustom: [],

3
src/client/components/form/input.vue
View File

@@ -261,8 +261,7 @@ export default defineComponent({
display: inline-block;
min-width: 16px;
max-width: 150px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

9
src/client/components/form/link.vue
View File

@@ -8,7 +8,7 @@
<Fa :icon="faExternalLinkAlt" class="icon"/>
</span>
</a>
<MkA class="main _button _formPanel _formClickable" :class="{ active }" :to="to" v-else>
<MkA class="main _button _formPanel _formClickable" :class="{ active }" :to="to" :behavior="behavior" v-else>
<span class="icon"><slot name="icon"></slot></span>
<span class="text"><slot></slot></span>
<span class="right">
@@ -38,6 +38,10 @@ export default defineComponent({
type: Boolean,
required: false
},
behavior: {
type: String,
required: false,
},
},
data() {
return {
@@ -83,8 +87,7 @@ export default defineComponent({
> .text {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
padding-right: 12px;
}

5
src/client/components/global/a.vue
View File

@@ -98,6 +98,11 @@ export default defineComponent({
},
nav() {
if (this.behavior === 'browser') {
location.href = this.to;
return;
}
if (this.to.startsWith('/my/messaging')) {
if (ColdDeviceStorage.get('chatOpenBehavior') === 'window') return this.window();
if (ColdDeviceStorage.get('chatOpenBehavior') === 'popout') return this.popout();

3
src/client/components/global/avatar.vue
View File

@@ -101,8 +101,7 @@ export default defineComponent({
top: 0;
border-radius: 100%;
z-index: 1;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
object-fit: cover;
width: 100%;
height: 100%;

3
src/client/components/global/misskey-flavored-markdown.vue
View File

@@ -126,8 +126,7 @@ export default defineComponent({
&.nowrap {
white-space: pre;
word-wrap: normal; // https://codeday.me/jp/qa/20190424/690106.html
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
text-overflow: ellipsis;
}

3
src/client/components/instance-stats.vue
View File

@@ -692,8 +692,7 @@ export default defineComponent({
> dd {
text-overflow: ellipsis;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
white-space: nowrap;
}

3
src/client/components/instance-ticker.vue
View File

@@ -44,8 +44,7 @@ export default defineComponent({
height: $height;
border-radius: 4px 0 0 4px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
color: #fff;
> .icon {

6
src/client/components/media-banner.vue
View File

@@ -62,8 +62,7 @@ export default defineComponent({
width: 100%;
border-radius: 4px;
margin-top: 4px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
> .download,
> .sensitive {
@@ -78,8 +77,7 @@ export default defineComponent({
}
> b {
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
text-overflow: ellipsis;
}

3
src/client/components/media-image.vue
View File

@@ -143,8 +143,7 @@ export default defineComponent({
> a {
display: block;
cursor: zoom-in;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
width: 100%;
height: 100%;
background-position: center;

3
src/client/components/media-list.vue
View File

@@ -105,8 +105,7 @@ export default defineComponent({
grid-gap: 4px;
> * {
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
border-radius: 6px;
}

3
src/client/components/media-video.vue
View File

@@ -78,8 +78,7 @@ export default defineComponent({
align-items: center;
font-size: 3.5em;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
background-position: center;
background-size: cover;
width: 100%;

6
src/client/components/note-detailed.vue
View File

@@ -886,8 +886,7 @@ export default defineComponent({
.note {
position: relative;
transition: box-shadow 0.1s ease;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
contain: content;
&:focus-visible {
@@ -947,8 +946,7 @@ export default defineComponent({
}
> span {
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
flex-shrink: 1;
text-overflow: ellipsis;
white-space: nowrap;

6
src/client/components/note-header.vue
View File

@@ -61,8 +61,7 @@ export default defineComponent({
display: block;
margin: 0 .5em 0 0;
padding: 0;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
font-size: 1em;
font-weight: bold;
text-decoration: none;
@@ -91,8 +90,7 @@ export default defineComponent({
> .username {
margin: 0 .5em 0 0;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
text-overflow: ellipsis;
}

3
src/client/components/note-preview.vue
View File

@@ -50,8 +50,7 @@ export default defineComponent({
display: flex;
margin: 0;
padding: 0;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
font-size: 0.95em;
> .avatar {

9
src/client/components/note.vue
View File

@@ -861,8 +861,7 @@ export default defineComponent({
.tkcbzcuz {
position: relative;
transition: box-shadow 0.1s ease;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
contain: content;
// これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
@@ -949,8 +948,7 @@ export default defineComponent({
}
> span {
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
flex-shrink: 1;
text-overflow: ellipsis;
white-space: nowrap;
@@ -1022,8 +1020,7 @@ export default defineComponent({
&.collapsed {
position: relative;
max-height: 9em;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
> .fade {
display: block;

6
src/client/components/notification.vue
View File

@@ -268,8 +268,7 @@ export default defineComponent({
text-overflow: ellipsis;
white-space: nowrap;
min-width: 0;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
}
> .time {
@@ -280,8 +279,7 @@ export default defineComponent({
> .text {
white-space: nowrap;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
text-overflow: ellipsis;
> [data-icon] {

3
src/client/components/poll.vue
View File

@@ -112,8 +112,7 @@ export default defineComponent({
padding: 4px 8px;
border: solid 1px var(--divider);
border-radius: 4px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
cursor: pointer;
&:hover {

3
src/client/components/post-form-attaches.vue
View File

@@ -127,8 +127,7 @@ export default defineComponent({
height: 64px;
margin-right: 4px;
border-radius: 4px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
cursor: move;
&:hover > .remove {

3
src/client/components/sidebar.vue
View File

@@ -390,8 +390,7 @@ export default defineComponent({
font-size: $ui-font-size;
line-height: 3rem;
text-overflow: ellipsis;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
white-space: nowrap;
width: 100%;
text-align: left;

3
src/client/components/toast.vue
View File

@@ -67,8 +67,7 @@ export default defineComponent({
height: 100%;
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3);
border-radius: 8px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
}
}
</style>

6
src/client/components/ui/button.vue
View File

@@ -124,8 +124,7 @@ export default defineComponent({
text-decoration: none;
background: var(--buttonBg);
border-radius: 999px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
&:not(:disabled):hover {
background: var(--buttonHoverBg);
@@ -213,8 +212,7 @@ export default defineComponent({
width: 100%;
height: 100%;
border-radius: 6px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
::v-deep(div) {
position: absolute;

3
src/client/components/ui/container.vue
View File

@@ -116,8 +116,7 @@ export default defineComponent({
.ukygtjoj {
position: relative;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
&.naked {
background: transparent !important;

6
src/client/components/ui/input.vue
View File

@@ -298,8 +298,7 @@ export default defineComponent({
transform: scale(.75);
white-space: nowrap;
width: 133%;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
text-overflow: ellipsis;
> .warning {
@@ -355,8 +354,7 @@ export default defineComponent({
display: inline-block;
min-width: 16px;
max-width: 150px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

3
src/client/components/ui/menu.vue
View File

@@ -155,8 +155,7 @@ export default defineComponent({
font-size: 0.9em;
line-height: 20px;
text-align: center;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
text-overflow: ellipsis;
&.danger {

6
src/client/components/ui/modal-window.vue
View File

@@ -89,8 +89,7 @@ export default defineComponent({
<style lang="scss" scoped>
.ebkgoccj {
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
display: flex;
flex-direction: column;
contain: content;
@@ -124,8 +123,7 @@ export default defineComponent({
padding-left: 32px;
font-weight: bold;
white-space: nowrap;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
text-overflow: ellipsis;
pointer-events: none;

3
src/client/components/ui/range.vue
View File

@@ -89,8 +89,7 @@ export default defineComponent({
pointer-events: none;
font-size: 16px;
color: var(--inputLabel);
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
}
> input {

6
src/client/components/ui/window.vue
View File

@@ -402,8 +402,7 @@ export default defineComponent({
}
> .body {
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
display: flex;
flex-direction: column;
contain: content;
@@ -438,8 +437,7 @@ export default defineComponent({
position: relative;
line-height: var(--height);
white-space: nowrap;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
text-overflow: ellipsis;
text-align: center;
cursor: move;

6
src/client/components/url-preview.vue
View File

@@ -244,8 +244,7 @@ export default defineComponent({
font-size: 14px;
box-shadow: 0 0 0 1px var(--divider);
border-radius: 8px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
&:hover {
text-decoration: none;
@@ -327,8 +326,7 @@ export default defineComponent({
&.compact {
> article {
> header h1, p, footer {
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

3
src/client/components/user-info.vue
View File

@@ -110,8 +110,7 @@ export default defineComponent({
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
}
}

3
src/client/components/user-preview.vue
View File

@@ -111,8 +111,7 @@ export default defineComponent({
position: absolute;
z-index: 11000;
width: 300px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
transform-origin: center top;
> .info {

6
src/client/components/users-dialog.vue
View File

@@ -66,8 +66,7 @@ export default defineComponent({
height: 350px;
background: var(--panel);
border-radius: var(--radius);
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
display: flex;
flex-direction: column;
@@ -128,8 +127,7 @@ export default defineComponent({
> .body {
padding: 0 8px;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
> .name {
display: block;

3
src/client/components/visibility-picker.vue
View File

@@ -141,8 +141,7 @@ export default defineComponent({
> *:nth-child(2) {
flex: 1 1 auto;
white-space: nowrap;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
text-overflow: ellipsis;
> span:first-child {