From e35076e28000e411539964da22c6d7235a879940 Mon Sep 17 00:00:00 2001 From: josdejong Date: Thu, 3 Apr 2014 12:22:53 +0200 Subject: [PATCH] Turned off animation for rootPanel and itemSet (css issues) --- src/timeline/component/css/groupset.css | 8 -------- src/timeline/component/css/item.css | 7 +++++-- src/timeline/component/css/itemset.css | 2 ++ src/timeline/component/css/panel.css | 3 ++- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/timeline/component/css/groupset.css b/src/timeline/component/css/groupset.css index ae37328f..e843988d 100644 --- a/src/timeline/component/css/groupset.css +++ b/src/timeline/component/css/groupset.css @@ -16,8 +16,6 @@ margin: 0; border-right: 1px solid #bfbfbf; - -moz-box-sizing: border-box; - box-sizing: border-box; } .vis.timeline .labels .label-set { @@ -33,9 +31,6 @@ -moz-box-sizing: border-box; box-sizing: border-box; - - -webkit-transition: height .4s ease-in-out; - transition: height .4s ease-in-out; } .vis.timeline .labels .label-set .vlabel { @@ -47,9 +42,6 @@ -moz-box-sizing: border-box; box-sizing: border-box; - - -webkit-transition: top .4s ease-in-out, height .4s ease-in-out; - transition: top .4s ease-in-out, height .4s ease-in-out; } .vis.timeline.top .labels .label-set .vlabel, diff --git a/src/timeline/component/css/item.css b/src/timeline/component/css/item.css index 45922517..08c959b4 100644 --- a/src/timeline/component/css/item.css +++ b/src/timeline/component/css/item.css @@ -7,8 +7,8 @@ display: inline-block; padding: 5px; - -webkit-transition: top .4s ease-in-out, bottom .4s ease-in-out, height .4s ease-in-out; - transition: top .4s ease-in-out, bottom .4s ease-in-out, height .4s ease-in-out; + -webkit-transition: top .4s ease-in-out, bottom .4s ease-in-out; + transition: top .4s ease-in-out, bottom .4s ease-in-out; } .vis.timeline .item.selected { @@ -87,6 +87,9 @@ width: 0; border-left-width: 1px; border-left-style: solid; + + -webkit-transition: height .4s ease-in-out; + transition: height .4s ease-in-out; } .vis.timeline .item .content { diff --git a/src/timeline/component/css/itemset.css b/src/timeline/component/css/itemset.css index 95b0b678..d083d229 100644 --- a/src/timeline/component/css/itemset.css +++ b/src/timeline/component/css/itemset.css @@ -4,8 +4,10 @@ padding: 0; margin: 0; + /* FIXME: get transoition working for rootpanel and itemset -webkit-transition: height .4s ease-in-out; transition: height .4s ease-in-out; + */ } .vis.timeline .background { diff --git a/src/timeline/component/css/panel.css b/src/timeline/component/css/panel.css index 964f6424..57888edd 100644 --- a/src/timeline/component/css/panel.css +++ b/src/timeline/component/css/panel.css @@ -7,9 +7,10 @@ -moz-box-sizing: border-box; box-sizing: border-box; - /* FIXME: there is an issue with the height of the items when panel height is animated */ + /* FIXME: there is an issue with the height of the items when panel height is animated -webkit-transition: height .4s ease-in-out; transition: height .4s ease-in-out; + */ } .vis.timeline .vpanel {