From 9996603e158d18c87429410b344403718fa095f0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 20 Mar 2017 18:43:04 +0900 Subject: [PATCH] #299 Use Anime instead of Velocity --- package.json | 2 +- src/web/app/boot.js | 1 - src/web/app/common/tags/reaction-picker.tag | 33 +++++++++++++- src/web/app/common/tags/stream-indicator.tag | 20 ++++++--- src/web/app/desktop/tags/contextmenu.tag | 11 +++-- src/web/app/desktop/tags/dialog.tag | 43 ++++++++----------- .../app/desktop/tags/home-widgets/tips.tag | 22 ++++++---- src/web/app/desktop/tags/image-dialog.tag | 17 ++++---- src/web/app/desktop/tags/ui-notification.tag | 20 +++++---- src/web/app/desktop/tags/user-preview.tag | 20 +++++---- src/web/app/desktop/tags/window.tag | 39 +++++++---------- src/web/app/mobile/tags/notify.tag | 18 ++++---- 12 files changed, 139 insertions(+), 107 deletions(-) diff --git a/package.json b/package.json index 4761428c2..5e15ae918 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "@types/webpack": "2.2.11", "@types/webpack-stream": "3.2.6", "@types/websocket": "0.0.33", + "animejs": "2.0.1", "autwh": "0.0.1", "bcryptjs": "2.4.3", "body-parser": "1.17.1", @@ -141,7 +142,6 @@ "typescript": "2.2.1", "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#8f4b45f4f814c04918382949b4bcaf7a8d910281", "uuid": "3.0.1", - "velocity-animate": "1.4.3", "vhost": "3.0.2", "webpack": "2.2.1", "webpack-stream": "3.2.0", diff --git a/src/web/app/boot.js b/src/web/app/boot.js index 8a65e5973..8a9d623bd 100644 --- a/src/web/app/boot.js +++ b/src/web/app/boot.js @@ -3,7 +3,6 @@ */ import * as riot from 'riot'; -require('velocity-animate'); import api from './common/scripts/api'; import signout from './common/scripts/signout'; import checkForUpdate from './common/scripts/check-for-update'; diff --git a/src/web/app/common/tags/reaction-picker.tag b/src/web/app/common/tags/reaction-picker.tag index 194c9d7b4..688ccc32a 100644 --- a/src/web/app/common/tags/reaction-picker.tag +++ b/src/web/app/common/tags/reaction-picker.tag @@ -1,5 +1,5 @@ -
+
@@ -30,6 +30,8 @@ border 1px solid rgba(27, 31, 35, 0.15) border-radius 4px box-shadow 0 3px 12px rgba(27, 31, 35, 0.15) + transform scale(0.5) + opacity 0 > button width 40px @@ -46,6 +48,8 @@ diff --git a/src/web/app/common/tags/stream-indicator.tag b/src/web/app/common/tags/stream-indicator.tag index 0a48459d8..96d9b0ec9 100644 --- a/src/web/app/common/tags/stream-indicator.tag +++ b/src/web/app/common/tags/stream-indicator.tag @@ -35,6 +35,8 @@ diff --git a/src/web/app/desktop/tags/contextmenu.tag b/src/web/app/desktop/tags/contextmenu.tag index 8d53772de..c862f3f60 100644 --- a/src/web/app/desktop/tags/contextmenu.tag +++ b/src/web/app/desktop/tags/contextmenu.tag @@ -16,6 +16,7 @@ background #fff border-radius 0 4px 4px 4px box-shadow 2px 2px 8px rgba(0, 0, 0, 0.2) + opacity 0 ul display block @@ -95,6 +96,7 @@ diff --git a/src/web/app/desktop/tags/image-dialog.tag b/src/web/app/desktop/tags/image-dialog.tag index 91245dac9..a2bed46b6 100644 --- a/src/web/app/desktop/tags/image-dialog.tag +++ b/src/web/app/desktop/tags/image-dialog.tag @@ -35,26 +35,27 @@ diff --git a/src/web/app/desktop/tags/ui-notification.tag b/src/web/app/desktop/tags/ui-notification.tag index 34f310844..ec094edd6 100644 --- a/src/web/app/desktop/tags/ui-notification.tag +++ b/src/web/app/desktop/tags/ui-notification.tag @@ -22,21 +22,23 @@ diff --git a/src/web/app/desktop/tags/window.tag b/src/web/app/desktop/tags/window.tag index 9e48958a1..aefb6499b 100644 --- a/src/web/app/desktop/tags/window.tag +++ b/src/web/app/desktop/tags/window.tag @@ -173,6 +173,7 @@