From c18cb1d67ff6934ea4a0c1b0af7db50583bb36de Mon Sep 17 00:00:00 2001 From: AlexVangelov Date: Mon, 3 Feb 2014 23:49:43 +0200 Subject: [PATCH] change css classes 'panel' and 'label' to not match those of twitter bootstrap --- src/timeline/component/GroupSet.js | 2 +- src/timeline/component/Panel.js | 2 +- src/timeline/component/css/groupset.css | 8 ++++---- src/timeline/component/css/panel.css | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/timeline/component/GroupSet.js b/src/timeline/component/GroupSet.js index 997542e2..eefd397e 100644 --- a/src/timeline/component/GroupSet.js +++ b/src/timeline/component/GroupSet.js @@ -379,7 +379,7 @@ GroupSet.prototype.repaint = function repaint() { GroupSet.prototype._createLabel = function(id) { var group = this.groups[id]; var label = document.createElement('div'); - label.className = 'label'; + label.className = 'vlabel'; var inner = document.createElement('div'); inner.className = 'inner'; label.appendChild(inner); diff --git a/src/timeline/component/Panel.js b/src/timeline/component/Panel.js index e3badfae..a6fc5f06 100644 --- a/src/timeline/component/Panel.js +++ b/src/timeline/component/Panel.js @@ -54,7 +54,7 @@ Panel.prototype.repaint = function () { frame = this.frame; if (!frame) { frame = document.createElement('div'); - frame.className = 'panel'; + frame.className = 'vpanel'; var className = options.className; if (className) { diff --git a/src/timeline/component/css/groupset.css b/src/timeline/component/css/groupset.css index b6467a7f..1b497757 100644 --- a/src/timeline/component/css/groupset.css +++ b/src/timeline/component/css/groupset.css @@ -33,7 +33,7 @@ border-bottom: 1px solid #bfbfbf; } -.vis.timeline .labels .label-set .label { +.vis.timeline .labels .label-set .vlabel { position: absolute; left: 0; top: 0; @@ -41,19 +41,19 @@ color: #4d4d4d; } -.vis.timeline.top .labels .label-set .label, +.vis.timeline.top .labels .label-set .vlabel, .vis.timeline.top .groupset .itemset-axis { border-top: 1px solid #bfbfbf; border-bottom: none; } -.vis.timeline.bottom .labels .label-set .label, +.vis.timeline.bottom .labels .label-set .vlabel, .vis.timeline.bottom .groupset .itemset-axis { border-top: none; border-bottom: 1px solid #bfbfbf; } -.vis.timeline .labels .label-set .label .inner { +.vis.timeline .labels .label-set .vlabel .inner { display: inline-block; padding: 5px; } diff --git a/src/timeline/component/css/panel.css b/src/timeline/component/css/panel.css index 819f33f2..ba6c2ae2 100644 --- a/src/timeline/component/css/panel.css +++ b/src/timeline/component/css/panel.css @@ -8,7 +8,7 @@ box-sizing: border-box; } -.vis.timeline .panel { +.vis.timeline .vpanel { position: absolute; overflow: hidden; }