summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-03-22 01:00:13 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-03-22 01:00:17 +0900
commit6665233c0041229bc22a891812e00c10694903bd (patch)
tree161609d1f30ff3114f2df5c435964d27326569ae /src/web
parentMerge pull request #305 from syuilo/greenkeeper/gulp-uglify-2.1.2 (diff)
downloadsharkey-6665233c0041229bc22a891812e00c10694903bd.tar.gz
sharkey-6665233c0041229bc22a891812e00c10694903bd.tar.bz2
sharkey-6665233c0041229bc22a891812e00c10694903bd.zip
[Client] :art:
Diffstat (limited to 'src/web')
-rw-r--r--src/web/app/common/tags/reaction-picker.tag10
-rw-r--r--src/web/app/common/tags/stream-indicator.tag2
2 files changed, 10 insertions, 2 deletions
diff --git a/src/web/app/common/tags/reaction-picker.tag b/src/web/app/common/tags/reaction-picker.tag
index 9bd7f96c7a..ac0d392c88 100644
--- a/src/web/app/common/tags/reaction-picker.tag
+++ b/src/web/app/common/tags/reaction-picker.tag
@@ -26,6 +26,7 @@
width 100%
height 100%
background rgba(0, 0, 0, 0.1)
+ opacity 0
> .popover
position absolute
@@ -131,8 +132,15 @@
}
anime({
+ targets: this.refs.backdrop,
+ opacity: 1,
+ duration: 100,
+ easing: 'linear'
+ });
+
+ anime({
targets: this.refs.popover,
- opacity: [0, 1],
+ opacity: 1,
scale: [0.5, 1],
duration: 500
});
diff --git a/src/web/app/common/tags/stream-indicator.tag b/src/web/app/common/tags/stream-indicator.tag
index 96d9b0ec95..d9f030e19b 100644
--- a/src/web/app/common/tags/stream-indicator.tag
+++ b/src/web/app/common/tags/stream-indicator.tag
@@ -64,7 +64,7 @@
targets: this.root,
opacity: 1,
easing: 'linear',
- duration: 50
+ duration: 100
});
});
</script>