Browse Source

Fixed #448: added some styles to prevent conflicts with bootstrap css styles

v3_develop
jos 10 years ago
parent
commit
cebb52d516
2 changed files with 8 additions and 0 deletions
  1. +2
    -0
      gulpfile.js
  2. +6
    -0
      lib/shared/bootstrap.css

+ 2
- 0
gulpfile.js View File

@ -81,6 +81,8 @@ gulp.task('bundle-js', ['clean'], function (cb) {
gulp.task('bundle-css', ['clean'], function () { gulp.task('bundle-css', ['clean'], function () {
var files = [ var files = [
'./lib/shared/activator.css', './lib/shared/activator.css',
'./lib/shared/bootstrap.css',
'./lib/timeline/component/css/timeline.css', './lib/timeline/component/css/timeline.css',
'./lib/timeline/component/css/panel.css', './lib/timeline/component/css/panel.css',
'./lib/timeline/component/css/labelset.css', './lib/timeline/component/css/labelset.css',

+ 6
- 0
lib/shared/bootstrap.css View File

@ -0,0 +1,6 @@
/* override some bootstrap styles screwing up the timelines css */
.vis [class*="span"] {
min-height: 0;
width: auto;
}

Loading…
Cancel
Save