sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
sim1222 2022-04-02 16:07:03 +09:00
commit 9cf6561a95
6 changed files with 202 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "12.109.0-simkey-v1", "version": "12.109.0-simkey-v2",
"codename": "indigo", "codename": "indigo",
"repository": { "repository": {
"type": "git", "type": "git",

33
packages/client/src/components/ui/button.vue
View File

@ -1,9 +1,10 @@
<template> <template>
<button v-if="!link" class="bghgjjyj _button" <button v-if="!link" class="bghgjjyj _button"
:class="{ inline, primary, gradate, danger, rounded, full }" :class="{ inline, primary, gradate, danger, rounded, full, 'hoverd': hoverd === true}"
:type="type" :type="type"
@click="$emit('click', $event)" @click="$emit('click', $event)"
@mousedown="onMousedown" @mousedown="onMousedown"
@mouseover="onMouseOver"
> >
<div ref="ripples" class="ripples"></div> <div ref="ripples" class="ripples"></div>
<div class="content"> <div class="content">
@ -24,7 +25,7 @@
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
let hoverd: boolean = false;
export default defineComponent({ export default defineComponent({
props: { props: {
type: { type: {
@ -127,9 +128,16 @@ export default defineComponent({
window.setTimeout(() => { window.setTimeout(() => {
if (this.$refs.ripples) this.$refs.ripples.removeChild(ripple); if (this.$refs.ripples) this.$refs.ripples.removeChild(ripple);
}, 2000); }, 2000);
},
onMouseOver(){
hoverd = !hoverd;
} }
} }
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -259,4 +267,25 @@ export default defineComponent({
z-index: 1; z-index: 1;
} }
} }
.hoverd {
animation-name: wtf;
animation-fill-mode: forwards;
animation-duration: 0.5s;
animation-timing-function: ease;
animation-iteration-count: infinite;
}
@keyframes wtf {
0% {
transform: scale(1, 1) translate(0px);
}
10% {
transform: scale(0, 0) translate(2px);
}
100% {
transform: scale(1, 1) translate(900px);
}
}
</style> </style>

57
packages/client/src/pages/welcome.entrance.a.vue
View File

@ -27,7 +27,7 @@
<div class="desc" v-html="meta.description || $ts.headlineMisskey"></div> <div class="desc" v-html="meta.description || $ts.headlineMisskey"></div>
</div> </div>
<div class="action"> <div class="action">
<MkButton inline gradate data-cy-signup style="margin-right: 12px;" @click="signup()">{{ $ts.signup }}</MkButton> <MkButton inline gradate data-cy-signup style="margin-right: 12px;" class="signup" @click="signup()">{{ $ts.signup }}</MkButton>
<MkButton inline data-cy-signin @click="signin()">{{ $ts.login }}</MkButton> <MkButton inline data-cy-signin @click="signin()">{{ $ts.login }}</MkButton>
</div> </div>
<div v-if="onlineUsersCount && stats" class="status"> <div v-if="onlineUsersCount && stats" class="status">
@ -317,4 +317,59 @@ export default defineComponent({
} }
} }
} }
._button,.mk-emoji,.text,span,._panel,.havbbuyv,.note,.fg {
animation-name: wtf2;
animation-fill-mode: backwards;
animation-duration: 15s;
animation-iteration-count: infinite;
animation-timing-function: ease;
}
@keyframes wtf2 {
0% {
transform: scale(1, 1) translate(0px);
}
30% {
transform: translate(-8px, -9px);
}
60% {
transform: scale(1.1, 1.1) translate(10px, 10px);
}
90% {
transform: scale(0.9, 0.9) translate(-2px, 6px);
}
100% {
transform: scale(1, 1) translate(0px, 0px);
}
}
.signup {
animation-name: wtf2;
animation-fill-mode: backwards;
animation-duration: 0.1s;
animation-iteration-count: infinite;
animation-timing-function: ease;
}
//2022-wtf
._button:hover {
animation-name: wtf;
animation-fill-mode: forwards;
animation-duration: 0.5s;
animation-timing-function: ease;
animation-iteration-count: infinite;
}
@keyframes wtf {
0% {
transform: scale(1, 1) translate(0px);
}
10% {
transform: scale(0, 0) translate(2px);
}
100% {
transform: scale(1, 1) translate(900px);
}
}
</style> </style>

55
packages/client/src/pages/welcome.entrance.b.vue
View File

@ -233,4 +233,59 @@ export default defineComponent({
} }
} }
} }
._button,.mk-emoji,.text,span,._panel,.havbbuyv,.note,.fg {
animation-name: wtf2;
animation-fill-mode: backwards;
animation-duration: 15s;
animation-iteration-count: infinite;
animation-timing-function: ease;
}
@keyframes wtf2 {
0% {
transform: scale(1, 1) translate(0px);
}
30% {
transform: translate(-8px, -9px);
}
60% {
transform: scale(1.1, 1.1) translate(10px, 10px);
}
90% {
transform: scale(0.9, 0.9) translate(-2px, 6px);
}
100% {
transform: scale(1, 1) translate(0px, 0px);
}
}
.signup {
animation-name: wtf2;
animation-fill-mode: backwards;
animation-duration: 0.1s;
animation-iteration-count: infinite;
animation-timing-function: ease;
}
//2022-wtf
._button:hover {
animation-name: wtf;
animation-fill-mode: forwards;
animation-duration: 0.5s;
animation-timing-function: ease;
animation-iteration-count: infinite;
}
@keyframes wtf {
0% {
transform: scale(1, 1) translate(0px);
}
10% {
transform: scale(0, 0) translate(2px);
}
100% {
transform: scale(1, 1) translate(900px);
}
}
</style> </style>

57
packages/client/src/pages/welcome.entrance.c.vue
View File

@ -24,7 +24,7 @@
<div class="desc" v-html="meta.description || $ts.headlineMisskey"></div> <div class="desc" v-html="meta.description || $ts.headlineMisskey"></div>
</div> </div>
<div class="action"> <div class="action">
<MkButton inline gradate @click="signup()">{{ $ts.signup }}</MkButton> <MkButton inline gradate class="signup" @click="signup()">{{ $ts.signup }}</MkButton>
<MkButton inline @click="signin()">{{ $ts.login }}</MkButton> <MkButton inline @click="signin()">{{ $ts.login }}</MkButton>
</div> </div>
<div v-if="onlineUsersCount && stats" class="status"> <div v-if="onlineUsersCount && stats" class="status">
@ -302,4 +302,59 @@ export default defineComponent({
} }
} }
} }
._button,.mk-emoji,.text,span,._panel,.havbbuyv,.note,.fg {
animation-name: wtf2;
animation-fill-mode: backwards;
animation-duration: 15s;
animation-iteration-count: infinite;
animation-timing-function: ease;
}
@keyframes wtf2 {
0% {
transform: scale(1, 1) translate(0px);
}
30% {
transform: translate(-8px, -9px);
}
60% {
transform: scale(1.1, 1.1) translate(10px, 10px);
}
90% {
transform: scale(0.9, 0.9) translate(-2px, 6px);
}
100% {
transform: scale(1, 1) translate(0px, 0px);
}
}
.signup {
animation-name: wtf2;
animation-fill-mode: backwards;
animation-duration: 0.1s;
animation-iteration-count: infinite;
animation-timing-function: ease;
}
//2022-wtf
._button:hover {
animation-name: wtf;
animation-fill-mode: forwards;
animation-duration: 0.5s;
animation-timing-function: ease;
animation-iteration-count: infinite;
}
@keyframes wtf {
0% {
transform: scale(1, 1) translate(0px);
}
10% {
transform: scale(0, 0) translate(2px);
}
100% {
transform: scale(1, 1) translate(900px);
}
}
</style> </style>

6
packages/client/src/style.scss
View File

@ -17,7 +17,7 @@
::selection { ::selection {
color: #fff; color: #fff;
background-color: var(--accent); background-color: var(--accent);
} }
html { html {
touch-action: manipulation; touch-action: manipulation;
@ -355,11 +355,11 @@ hr {
._section:not(:empty) { ._section:not(:empty) {
box-sizing: border-box; box-sizing: border-box;
padding: var(--root-margin, 32px); padding: var(--root-margin, 32px);
@media (max-width: 500px) { @media (max-width: 500px) {
--root-margin: 10px; --root-margin: 10px;
} }
& + ._section:not(:empty) { & + ._section:not(:empty) {
border-top: solid 0.5px var(--divider); border-top: solid 0.5px var(--divider);
} }