From c69b9d3be0033c35dd7b44dab1b444037282677e Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 17 Feb 2016 22:32:26 +0200 Subject: [PATCH] Working on TravisCI --- .travis.yml | 2 +- resources/views/reports/d3.blade.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b783ffaa443..0eaf689b5085 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,7 @@ before_script: - cp .env.example .env - cp tests/_bootstrap.php.default tests/_bootstrap.php - php artisan key:generate --no-interaction + - sed -i 's/APP_ENV=production/APP_ENV=development/g' .env # create the database and user - mysql -u root -e "create database IF NOT EXISTS ninja;" - mysql -u root -e "GRANT ALL PRIVILEGES ON ninja.* To 'ninja'@'localhost' IDENTIFIED BY 'ninja'; FLUSH PRIVILEGES;" @@ -48,7 +49,6 @@ before_script: - php artisan migrate --no-interaction - php artisan db:seed --no-interaction # default seed - php artisan db:seed --no-interaction --class=UserTableSeeder # development seed - - mysql -u root -e "use ninja;select email from users;" # Start webserver on ninja.dev:8000 - php artisan serve --host=ninja.dev --port=8000 & # '&' allows to run in background # Start PhantomJS diff --git a/resources/views/reports/d3.blade.php b/resources/views/reports/d3.blade.php index 6685441321ce..db3f05788c10 100644 --- a/resources/views/reports/d3.blade.php +++ b/resources/views/reports/d3.blade.php @@ -233,7 +233,7 @@ .attr("class", "no-pointer-events") .attr("class", "animate-grow") .attr("d", arc) - .style("fill", function(d, i) { return 'grey'; }); + .style("fill", function(d, i) { return '#2e9e49'; }); d3.selectAll("path.animate-grow") .transition() @@ -245,7 +245,8 @@ .transition() .duration(1000) .style("fill", function(d, i) { - return d.displayAge == -1 ? 'grey' : color(d.displayAge); + //return d.displayAge == -1 ? 'grey' : color(d.displayAge); + return d.displayAge == -1 ? 'grey' : '#FF0000'; }); selection.exit().remove();