Browse Source

Merge remote-tracking branch 'origin/develop' into develop

css_transitions
josdejong 10 years ago
parent
commit
6f7091fdec
4 changed files with 7 additions and 7 deletions
  1. +1
    -1
      src/timeline/component/GroupSet.js
  2. +1
    -1
      src/timeline/component/Panel.js
  3. +4
    -4
      src/timeline/component/css/groupset.css
  4. +1
    -1
      src/timeline/component/css/panel.css

+ 1
- 1
src/timeline/component/GroupSet.js View File

@ -379,7 +379,7 @@ GroupSet.prototype.repaint = function repaint() {
GroupSet.prototype._createLabel = function(id) { GroupSet.prototype._createLabel = function(id) {
var group = this.groups[id]; var group = this.groups[id];
var label = document.createElement('div'); var label = document.createElement('div');
label.className = 'label';
label.className = 'vlabel';
var inner = document.createElement('div'); var inner = document.createElement('div');
inner.className = 'inner'; inner.className = 'inner';
label.appendChild(inner); label.appendChild(inner);

+ 1
- 1
src/timeline/component/Panel.js View File

@ -54,7 +54,7 @@ Panel.prototype.repaint = function () {
frame = this.frame; frame = this.frame;
if (!frame) { if (!frame) {
frame = document.createElement('div'); frame = document.createElement('div');
frame.className = 'panel';
frame.className = 'vpanel';
var className = options.className; var className = options.className;
if (className) { if (className) {

+ 4
- 4
src/timeline/component/css/groupset.css View File

@ -33,7 +33,7 @@
border-bottom: 1px solid #bfbfbf; border-bottom: 1px solid #bfbfbf;
} }
.vis.timeline .labels .label-set .label {
.vis.timeline .labels .label-set .vlabel {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
@ -41,19 +41,19 @@
color: #4d4d4d; color: #4d4d4d;
} }
.vis.timeline.top .labels .label-set .label,
.vis.timeline.top .labels .label-set .vlabel,
.vis.timeline.top .groupset .itemset-axis { .vis.timeline.top .groupset .itemset-axis {
border-top: 1px solid #bfbfbf; border-top: 1px solid #bfbfbf;
border-bottom: none; border-bottom: none;
} }
.vis.timeline.bottom .labels .label-set .label,
.vis.timeline.bottom .labels .label-set .vlabel,
.vis.timeline.bottom .groupset .itemset-axis { .vis.timeline.bottom .groupset .itemset-axis {
border-top: none; border-top: none;
border-bottom: 1px solid #bfbfbf; border-bottom: 1px solid #bfbfbf;
} }
.vis.timeline .labels .label-set .label .inner {
.vis.timeline .labels .label-set .vlabel .inner {
display: inline-block; display: inline-block;
padding: 5px; padding: 5px;
} }

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

@ -8,7 +8,7 @@
box-sizing: border-box; box-sizing: border-box;
} }
.vis.timeline .panel {
.vis.timeline .vpanel {
position: absolute; position: absolute;
overflow: hidden; overflow: hidden;
} }

Loading…
Cancel
Save