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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

7
src/client/pages/settings/other.vue
View File

@@ -23,13 +23,16 @@
<FormLink to="/settings/registry"><template #icon><Fa :icon="faCogs"/></template>{{ $ts.registry }}</FormLink>
<FormLink to="/bios" behavior="browser"><template #icon><Fa :icon="faDoorOpen"/></template>BIOS</FormLink>
<FormLink to="/cli" behavior="browser"><template #icon><Fa :icon="faDoorOpen"/></template>CLI</FormLink>
<FormButton @click="closeAccount" danger>{{ $ts.closeAccount }}</FormButton>
</FormBase>
</template>
<script lang="ts">
import { defineAsyncComponent, defineComponent } from 'vue';
import { faEllipsisH, faCogs } from '@fortawesome/free-solid-svg-icons';
import { faEllipsisH, faCogs, faDoorOpen } from '@fortawesome/free-solid-svg-icons';
import FormSwitch from '@/components/form/switch.vue';
import FormSelect from '@/components/form/select.vue';
import FormLink from '@/components/form/link.vue';
@@ -61,7 +64,7 @@ export default defineComponent({
icon: faEllipsisH
},
debug,
faCogs
faCogs, faDoorOpen,
}
},

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

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

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

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

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

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

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

@@ -167,8 +167,7 @@ export default defineComponent({
margin: auto;
width: 500px;
height: calc(100% - 128px);
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
-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,8 +151,7 @@ export default defineComponent({
margin: auto;
width: 500px;
height: calc(100% - 128px);
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
-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,8 +71,7 @@ export default defineComponent({
.mk-setup {
border-radius: var(--radius);
box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
overflow: hidden; // overflow: clip; をSafariが対応したら消す
overflow: clip;
overflow: hidden;
> h1 {
margin: 0;