Merge pull request #32 from AlexVangelov/master

change css classes 'panel' and 'label' to not match those of twitter bootstrap
almende · Feb 5, 2014 · dd81e4c · dd81e4c
2 parents 4e71b1a + c18cb1d
commit dd81e4c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -33,27 +33,27 @@
   border-bottom: 1px solid #bfbfbf;
 }
 
-.vis.timeline .labels .label-set .label {
+.vis.timeline .labels .label-set .vlabel {
   position: absolute;
   left: 0;
   top: 0;
   width: 100%;
   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
@@ -8,7 +8,7 @@
   box-sizing: border-box;
 }
 
-.vis.timeline .panel {
+.vis.timeline .vpanel {
   position: absolute;
   overflow: hidden;
 }