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-02-28 18:59:21 +09:00
parent c88d7a1087 68ace4a311
commit 3d67998cbc
86 changed files with 1100 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/pages/about-misskey.vue
View File

@@ -1,5 +1,5 @@
<template>
<div style="overflow: hidden;">
<div style="overflow: hidden; overflow: clip;">
<FormBase class="znqjceqz">
<div id="debug"></div>
<section class="_formItem about">

6
src/client/pages/follow-requests.vue
View File

@@ -104,7 +104,8 @@ export default defineComponent({
display: block;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
margin: 0;
}
@@ -124,7 +125,8 @@ export default defineComponent({
width: 55%;
line-height: 42px;
white-space: nowrap;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
text-overflow: ellipsis;
opacity: 0.7;
font-size: 14px;

18
src/client/pages/instance/emojis.vue
View File

@@ -178,17 +178,20 @@ export default defineComponent({
> .body {
padding: 0 0 0 8px;
white-space: nowrap;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
> .name {
text-overflow: ellipsis;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
}
> .info {
opacity: 0.5;
text-overflow: ellipsis;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
}
}
}
@@ -219,17 +222,20 @@ export default defineComponent({
> .body {
padding: 0 0 0 8px;
white-space: nowrap;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
> .name {
text-overflow: ellipsis;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
}
> .info {
opacity: 0.5;
text-overflow: ellipsis;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
}
}
}

9
src/client/pages/messaging/index.vue
View File

@@ -226,12 +226,14 @@ export default defineComponent({
align-items: center;
margin-bottom: 2px;
white-space: nowrap;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
> .name {
margin: 0;
padding: 0;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
text-overflow: ellipsis;
font-size: 1em;
font-weight: bold;
@@ -262,7 +264,8 @@ export default defineComponent({
display: block;
margin: 0 0 0 0;
padding: 0;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow-wrap: break-word;
font-size: 1.1em;
color: var(--faceText);

4
src/client/pages/messaging/messaging-room.form.vue
View File

@@ -223,9 +223,7 @@ export default defineComponent({
},
async insertEmoji(ev) {
os.pickEmoji(ev.currentTarget || ev.target).then(emoji => {
insertTextAtCursor(this.$refs.text, emoji);
});
os.openEmojiPicker(ev.currentTarget || ev.target, {}, this.$refs.text);
}
}
});

9
src/client/pages/messaging/messaging-room.message.vue
View File

@@ -154,7 +154,8 @@ export default defineComponent({
display: block;
margin: 0;
padding: 0;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow-wrap: break-word;
font-size: 1em;
color: rgba(#000, 0.5);
@@ -164,7 +165,8 @@ export default defineComponent({
display: block;
margin: 0;
padding: 12px 18px;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow-wrap: break-word;
word-break: break-word;
font-size: 1em;
@@ -182,7 +184,8 @@ export default defineComponent({
display: block;
max-width: 100%;
border-radius: 16px;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
text-decoration: none;
&:hover {

3
src/client/pages/page-editor/page-editor.container.vue
View File

@@ -74,7 +74,8 @@ export default defineComponent({
<style lang="scss" scoped>
.cpjygsrt {
position: relative;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
background: var(--panel);
border: solid 2px var(--X12);
border-radius: 6px;

3
src/client/pages/reversi/game.board.vue
View File

@@ -434,7 +434,8 @@ export default defineComponent({
> div {
background: transparent;
border-radius: 6px;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
* {
pointer-events: none;

3
src/client/pages/reversi/game.setting.vue
View File

@@ -333,7 +333,8 @@ export default defineComponent({
background: transparent;
border: solid 2px var(--divider);
border-radius: 6px;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
cursor: pointer;
* {

3
src/client/pages/settings/drive.vue
View File

@@ -230,7 +230,8 @@ export default defineComponent({
$size: 12px;
background: rgba(0, 0, 0, 0.1);
border-radius: ($size / 2);
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
> div {
height: $size;

2
src/client/pages/settings/reaction.vue
View File

@@ -105,7 +105,7 @@ export default defineComponent({
},
preview(ev) {
os.popup(import('@/components/emoji-picker.vue'), {
os.popup(import('@/components/emoji-picker-dialog.vue'), {
asReactionPicker: true,
src: ev.currentTarget || ev.target,
}, {}, 'closed');

3
src/client/pages/settings/security.vue
View File

@@ -144,7 +144,8 @@ export default defineComponent({
flex: 1;
min-width: 0;
white-space: nowrap;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
text-overflow: ellipsis;
margin-right: 12px;
}

3
src/client/pages/settings/theme.vue
View File

@@ -184,7 +184,8 @@ export default defineComponent({
position: absolute;
top: 50%;
left: 50%;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
padding: 0 100px;
transform: translate3d(-50%, -50%, 0);

24
src/client/pages/user/index.vue
View File

@@ -369,7 +369,8 @@ export default defineComponent({
position: relative;
height: 450px;
border-radius: 16px;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
background-size: cover;
background-position: center;
@@ -472,7 +473,8 @@ export default defineComponent({
> .name {
width: 30%;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
white-space: nowrap;
text-overflow: ellipsis;
font-weight: bold;
@@ -480,7 +482,8 @@ export default defineComponent({
> .value {
width: 70%;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
white-space: nowrap;
text-overflow: ellipsis;
margin: 0;
@@ -542,7 +545,8 @@ export default defineComponent({
.ftskorzw.narrow {
max-width: 100vw;
box-sizing: border-box;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
> .punished {
font-size: 0.8em;
@@ -553,12 +557,14 @@ export default defineComponent({
> .main {
position: relative;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
> .banner-container {
position: relative;
height: 250px;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
background-size: cover;
background-position: center;
@@ -703,7 +709,8 @@ export default defineComponent({
> .name {
width: 30%;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
white-space: nowrap;
text-overflow: ellipsis;
font-weight: bold;
@@ -712,7 +719,8 @@ export default defineComponent({
> .value {
width: 70%;
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
white-space: nowrap;
text-overflow: ellipsis;
margin: 0;

3
src/client/pages/welcome.entrance.a.vue
View File

@@ -167,7 +167,8 @@ export default defineComponent({
margin: auto;
width: 500px;
height: calc(100% - 128px);
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);

3
src/client/pages/welcome.entrance.b.vue
View File

@@ -151,7 +151,8 @@ export default defineComponent({
margin: auto;
width: 500px;
height: calc(100% - 128px);
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
-webkit-mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 128px, rgba(0,0,0,1) calc(100% - 128px), rgba(0,0,0,0) 100%);
}

3
src/client/pages/welcome.setup.vue
View File

@@ -71,7 +71,8 @@ export default defineComponent({
.mk-setup {
border-radius: var(--radius);
box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
overflow: hidden;
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
> h1 {
margin: 0;