This is an automated email from the git hooks/post-receive script. New commit to branch feature/8004-new-way-input-themes-keywords in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit d7206b6cab35337ddb524d524d8777709935f2bb Author: Yannick Martel <martel@©odelutin.com> Date: Mon Feb 29 14:13:55 2016 +0100 fix bad merge --- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index b4f8a56..dfbccf3 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -1277,9 +1277,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam 'links' : []}; $scope.existing = {'types' : [], 'themes' : []}; $scope.topWords = [{text:"coselmar", weight: 10}, {text: "Ifremer", weight: 5}]; - //$scope.cloudColors = ["#2f8389", "#349198", "#39A0A8", "#3eaeb6", "#48b8c0"]; - //FIXME Leo #CSS si tu veux trouver de belles couleurs pour le nuage, c'est là :) - $scope.cloudColors = []; + $scope.cloudColors = ["#2f8389", "#349198", "#39A0A8", "#3eaeb6", "#48b8c0"]; $scope.toAddTheme = {}; // Preload exiting types and themes -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.