profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into refactor-drive

Browse source
This commit is contained in:
syuilo 2019-03-02 07:18:01 +09:00
commit 1d3342e641
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
20 changed files with 1524 additions and 2139 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/client/app/animation.styl
View file

@ -39,3 +39,9 @@
75% { transform: translateY(-8px); }
100% { transform: translateY(0); }
}
@keyframes blink {
0% { opacity: 1; }
30% { opacity: 1; }
90% { opacity: 0; }
}

1
src/client/app/desktop/views/components/ui.header.messaging.vue
View file

@ -64,5 +64,6 @@ export default Vue.extend({
vertical-align super
font-size 10px
color var(--notificationIndicator)
animation blink 1s infinite
</style>

1
src/client/app/desktop/views/components/ui.header.notifications.vue
View file

@ -91,6 +91,7 @@ export default Vue.extend({
vertical-align super
font-size 10px
color var(--notificationIndicator)
animation blink 1s infinite
> .pop
$bgcolor = var(--face)

1
src/client/app/mobile/views/components/ui.vue
View file

@ -126,6 +126,7 @@ export default Vue.extend({
left 0
color var(--notificationIndicator)
font-size 16px
animation blink 1s infinite
&.post
right 28px

4
src/server/web/url-preview.ts
View file

@ -9,7 +9,9 @@ const logger = new Logger('url-preview');
module.exports = async (ctx: Koa.BaseContext) => {
const meta = await fetchMeta();
logger.info(`Getting preview of ${ctx.query.url} ...`);
logger.info(meta.summalyProxy
? `(Proxy) Getting preview of ${ctx.query.url} ...`
: `Getting preview of ${ctx.query.url} ...`);
try {
const summary = meta.summalyProxy ? await request.get({