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-09 19:57:02 +09:00
parent 4de7e57e29 fb60ffd319
commit 6711202bce
326 changed files with 3539 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
<div id="debug"></div>
<section class="_formItem about">
<div class="_formPanel panel" :class="{ playing: easterEggEngine != null }" ref="about">
<img src="/assets/about-icon.png" alt="" class="icon" ref="icon" @load="iconLoaded" draggable="false"/>
<img src="/static-assets/client/about-icon.png" alt="" class="icon" ref="icon" @load="iconLoaded" draggable="false"/>
<div class="misskey">Misskey</div>
<div class="version">v{{ version }}</div>
<span class="emoji" v-for="emoji in easterEggEmojis" :key="emoji.id" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :custom-emojis="$instance.emojis" :is-reaction="false" :normal="true" :no-style="true"/></span>

2
src/client/pages/explore.vue
View File

@@ -30,7 +30,7 @@
</template>
</div>
<div class="_section">
<div class="localfedi7 _panel _vMargin" v-if="tag == null" :style="{ backgroundImage: `url(/assets/fedi.jpg)` }">
<div class="localfedi7 _panel _vMargin" v-if="tag == null" :style="{ backgroundImage: `url(/static-assets/client/fedi.jpg)` }">
<header><span>{{ $ts.exploreFediverse }}</span></header>
</div>

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

@@ -200,7 +200,7 @@ export default defineComponent({
&:not(.isMe):not(.isRead) {
> div {
background-image: url("/assets/unread.svg");
background-image: url("/static-assets/client/unread.svg");
background-repeat: no-repeat;
background-position: 0 center;
}

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

@@ -4,7 +4,7 @@
<div class="content">
<div class="balloon" :class="{ noText: message.text == null }" >
<button class="delete-button" v-if="isMe" :title="$ts.delete" @click="del">
<img src="/assets/remove.png" alt="Delete"/>
<img src="/static-assets/client/remove.png" alt="Delete"/>
</button>
<div class="content" v-if="!message.isDeleted">
<Mfm class="text" v-if="message.text" ref="text" :text="message.text" :i="$i"/>

2
src/client/pages/settings/theme.manage.vue
View File

@@ -93,6 +93,8 @@ export default defineComponent({
uninstall() {
removeTheme(this.selectedTheme);
this.selectedThemeId = null;
os.success();
},
}
});

2
src/client/pages/v.vue
View File

@@ -2,7 +2,7 @@
<div>
<section class="_section">
<div class="_content" style="text-align: center;">
<img src="/assets/icons/512.png" alt="" style="display: block; width: 100px; margin: 0 auto; border-radius: 16px;"/>
<img src="/static-assets/icons/512.png" alt="" style="display: block; width: 100px; margin: 0 auto; border-radius: 16px;"/>
<div style="margin-top: 0.75em;">Misskey</div>
<div style="opacity: 0.5;">v{{ version }}</div>
</div>

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

@@ -3,8 +3,9 @@
<div class="top">
<MkFeaturedPhotos class="bg"/>
<XTimeline class="tl"/>
<div class="shape"></div>
<img src="/assets/misskey.svg" class="misskey"/>
<div class="shape1"></div>
<div class="shape2"></div>
<img src="/static-assets/client/misskey.svg" class="misskey"/>
<div class="emojis">
<MkEmoji :normal="true" :no-style="true" emoji="👍"/>
<MkEmoji :normal="true" :no-style="true" emoji="❤"/>
@@ -18,7 +19,9 @@
</div>
<div class="fg">
<h1>
<img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span>
<!-- 背景色によってはロゴが見えなくなるのでとりあえず無効に -->
<!-- <img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span> -->
<span class="text">{{ instanceName }}</span>
</h1>
<div class="about">
<div class="desc" v-html="meta.description || $ts.headlineMisskey"></div>
@@ -154,8 +157,8 @@ export default defineComponent({
> .bg {
position: absolute;
top: 0;
left: 0;
width: 100%;
right: 0;
width: 80%; // 100%からshapeの幅を引いている
height: 100%;
}
@@ -176,14 +179,24 @@ export default defineComponent({
}
}
> .shape {
> .shape1 {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: var(--accent);
clip-path: polygon(0% 0%, 50% 0%, 15% 100%, 0% 100%);
clip-path: polygon(0% 0%, 45% 0%, 20% 100%, 0% 100%);
}
> .shape2 {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: var(--accent);
clip-path: polygon(0% 0%, 25% 0%, 35% 100%, 0% 100%);
opacity: 0.5;
}
> .misskey {

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

@@ -29,7 +29,7 @@
</I18n>
</div>
</div>
<img src="/assets/misskey.svg" class="misskey"/>
<img src="/static-assets/client/misskey.svg" class="misskey"/>
</div>
</div>
</template>

2
src/client/pages/welcome.entrance.c.vue
View File

@@ -11,7 +11,7 @@
<MkEmoji :normal="true" :no-style="true" emoji="🍮"/>
</div>
<div class="main">
<img src="/assets/misskey.svg" class="misskey"/>
<img src="/static-assets/client/misskey.svg" class="misskey"/>
<div class="form _panel">
<div class="bg">
<div class="fade"></div>