Merge pull request #37 from senid231/fix-css-import-jquery-datetimepicker

Fivell · web-flow · commit b7576d8e0f4c · 2017-11-15T13:25:52.000+02:00
fix importing of jquery datetimepicker css
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 script: bundle exec rspec spec
+cache: bundler
 env:
   matrix:
     - RAILS=4.2.6
@@ -8,6 +9,5 @@ rvm:
   - 2.3.3
 before_install:
   - gem update --system
-  - rvm @global do gem uninstall bundler -a -x
   - rvm @global do gem install bundler -v 1.14.6
   - gem --version
diff --git a/app/assets/stylesheets/active_admin_datetimepicker.scss b/app/assets/stylesheets/active_admin_datetimepicker.scss
@@ -1,4 +1,4 @@
-@import "jquery.xdan.datetimepicker.css";
+@import "jquery.xdan.datetimepicker";
 
 form.filter_form {
   .filter_form_field {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import "jquery.xdan.datetimepicker.css";`
	`1`	`+@import "jquery.xdan.datetimepicker";`
`2`	`2`
`3`	`3`	`form.filter_form {`
`4`	`4`	`.filter_form_field {`