This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit 971345e2b4114db7a7956927ca6a81922c5cac9c Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Feb 24 19:35:25 2016 +0100 Fixes #7974 : Affichage responsive du nuage de mots et modification des couleur en harmonie avec le reste de l'appli --- coselmar-ui/src/main/webapp/css/coselmar.css | 38 ++++++++++++++++++---- .../src/main/webapp/js/coselmar-controllers.js | 7 ++-- coselmar-ui/src/main/webapp/views/home.html | 2 +- .../main/webapp/views/questions/viewquestion.html | 3 +- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index bd49733..2859437 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -684,6 +684,20 @@ input[type="file"] { box-shadow: 2px 2px 5px rgba(0,0,0,0.1); } +.cloud dt.title { + width: 100%; +} + +#cloud-container { + width: 100%; + height: 300px; +} + +.aside #cloud-container { + width: 100%; + height: 200px; +} + /* Loading - Page de chargement -------------------------------------------------- */ #loading { @@ -722,11 +736,28 @@ input[type="file"] { /* Media queries -------------------------------------------------- */ +@media screen and (max-width: 1400px) { + .navbar .navbar-brand .logo { + height: 35px; + padding-top: 3px; + } + .navbar .navbar-brand span.title { + font-size: 12px; + } +} + @media screen and (max-width: 1200px) { #main-container, body .container { width: 90%; } + .navbar .navbar-brand .logo { + height: 30px; + padding-top: 3px; + } + .navbar .navbar-brand span.title { + font-size: 11px; + } } @@ -735,13 +766,6 @@ input[type="file"] { font-size: 13px; } - .navbar .navbar-brand .logo { - height: 30px; - padding-top: 3px; - } - .navbar .navbar-brand span.title { - font-size: 11px; - } .navbar .navbar-nav > li > a { padding-left: 6px; padding-right: 6px; diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 164614c..d4a0163 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -133,9 +133,7 @@ coselmarControllers.controller("homeConnectedCtrl", ['$scope', 'questionsService $scope.closedQuestions = []; $scope.topWords = [{text:"coselmar", weight: 10}, {text: "Ifremer", weight: 5}]; - //FIXME Leo #CSS si tu veux trouver de belles couleurs pour le nuage, c'est là :) - $scope.cloudColors = []; -// $scope.cloudColors = ["#800026", "#bd0026", "#e31a1c", "#fc4e2a", "#fd8d3c", "#feb24c", "#fed976"]; + $scope.cloudColors = ["#2f8389", "#349198", "#39A0A8", "#3eaeb6", "#48b8c0"]; if ($scope.context && $scope.context.currentUser) { @@ -1257,8 +1255,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam 'links' : []}; $scope.existing = {'types' : [], 'themes' : []}; $scope.topWords = [{text:"coselmar", weight: 10}, {text: "Ifremer", weight: 5}]; - //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"]; // Preload exiting types and themes questionsService.findAllTypes(function(results) { diff --git a/coselmar-ui/src/main/webapp/views/home.html b/coselmar-ui/src/main/webapp/views/home.html index 4fe27c3..c0095f4 100644 --- a/coselmar-ui/src/main/webapp/views/home.html +++ b/coselmar-ui/src/main/webapp/views/home.html @@ -28,7 +28,7 @@ <div class="column cloud"> <span class="title">{{ "home.wordCloud" | translate }}</span> - <jqcloud words="topWords" width="500" height="300" + <jqcloud words="topWords" id="cloud-container" colors="{{cloudColors}}" steps="21" font-size="{from:0.09, to:0.04}"></jqcloud> </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index 81f1c4b..3e3264a 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -145,11 +145,10 @@ <div class="form-group col-md-4 aside"> <div> - <!-- FIXME Leo #CSS --> <dl class="cloud"> <dt class="title">{{ "project.wordCloud" | translate }}</dt> <dd> - <jqcloud words="topWords" width="350" height="150" + <jqcloud words="topWords" id="cloud-container" colors="{{cloudColors}}" steps="21" font-size="{from:0.09, to:0.04}"></jqcloud> </dd> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.