Browse Source

Disabled css transitions for now, needs some more work

css_transitions
jos 10 years ago
parent
commit
91fc13348b
5 changed files with 9 additions and 30 deletions
  1. +0
    -6
      src/timeline/Timeline.js
  2. +2
    -2
      src/timeline/component/ItemSet.js
  3. +0
    -19
      src/timeline/component/css/groupset.css
  4. +6
    -2
      src/timeline/component/css/item.css
  5. +1
    -1
      src/timeline/component/css/itemset.css

+ 0
- 6
src/timeline/Timeline.js View File

@ -109,12 +109,6 @@ function Timeline (container, items, options) {
// main panel (contains time axis and itemsets)
var mainOptions = util.extend(Object.create(this.options), {
top: function () {
return (mainOptions.orientation == 'top') ? '0' : '';
},
bottom: function () {
return (mainOptions.orientation == 'top') ? '' : '0';
},
left: function () {
// we align left to enable a smooth resizing of the window
return me.sidePanel.width;

+ 2
- 2
src/timeline/component/ItemSet.js View File

@ -378,8 +378,8 @@ ItemSet.prototype.repaint = function repaint() {
this.dom.axis.style.right = asSize(options.right, '');
this.dom.axis.style.width = asSize(options.width, '100%');
this.dom.axis.style.height = asSize(0);
this.dom.axis.style.top = (orientation == 'top') ? '0' : '';
this.dom.axis.style.bottom = (orientation == 'top') ? '' : '0';
this.dom.axis.style.top = asSize((orientation == 'top') ? '0' : '');
this.dom.axis.style.bottom = asSize((orientation == 'top') ? '' : '0');
return this._isResized();
};

+ 0
- 19
src/timeline/component/css/groupset.css View File

@ -1,23 +1,4 @@
/* TODO: cleanup
.vis.timeline .groupset {
position: relative;
padding: 0;
margin: 0;
}
.vis.timeline .labels {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding: 0;
margin: 0;
}
*/
.vis.timeline .labelset {
position: relative;
width: 100%;

+ 6
- 2
src/timeline/component/css/item.css View File

@ -7,8 +7,10 @@
display: inline-block;
padding: 5px;
/* TODO: enable animations
-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 {
@ -88,8 +90,10 @@
border-left-width: 1px;
border-left-style: solid;
-webkit-transition: height .4s ease-in-out;
transition: height .4s ease-in-out;
/* TODO: enable animations
-webkit-transition: height .4s ease-in-out, top .4s ease-in-out;
transition: height .4s ease-in-out, top .4s ease-in-out;
*/
color: red;
}

+ 1
- 1
src/timeline/component/css/itemset.css View File

@ -7,7 +7,7 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
/* FIXME: get transoition working for rootpanel and itemset
/* FIXME: get transition working for rootpanel and itemset
-webkit-transition: height 4s ease-in-out;
transition: height 4s ease-in-out;
/**/

Loading…
Cancel
Save