diff --git a/gulpfile.js b/gulpfile.js
index c6b99744..fc75fc35 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -81,6 +81,8 @@ gulp.task('bundle-js', ['clean'], function (cb) {
 gulp.task('bundle-css', ['clean'], function () {
   var files = [
     './lib/shared/activator.css',
+    './lib/shared/bootstrap.css',
+
     './lib/timeline/component/css/timeline.css',
     './lib/timeline/component/css/panel.css',
     './lib/timeline/component/css/labelset.css',
diff --git a/lib/shared/bootstrap.css b/lib/shared/bootstrap.css
new file mode 100644
index 00000000..3603c766
--- /dev/null
+++ b/lib/shared/bootstrap.css
@@ -0,0 +1,6 @@
+/* override some bootstrap styles screwing up the timelines css */
+
+.vis [class*="span"] {
+  min-height: 0;
+  width: auto;
+}