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 b51b573b29cf1188f6e5bb1709ffda9d82435cfe Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Mon Feb 29 14:50:06 2016 +0100 Fixes #8004 : Amélioration de l'affichage du champ de saisie des thèmes et mot clés --- coselmar-ui/src/main/webapp/css/coselmar.css | 20 ++++++++++++++++---- .../main/webapp/views/documents/editDocument.html | 3 +-- .../src/main/webapp/views/documents/newdocument.html | 3 +-- .../main/webapp/views/questions/editquestion.html | 3 +-- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index df35e09..5e3e762 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -426,9 +426,16 @@ dl > dd { } .tag-input { - padding: 0; + padding: 5px 0; height: auto; } + +.tag-input .tag { + margin: 3px 10px; + display: block; + float: left; +} + .tag-input input[type="text"] { border: 0; display: inline-block; @@ -439,10 +446,11 @@ dl > dd { .tag-input input[type="text"]:focus { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6) inset; } -/*FIXME #CSS Leo pour l'utilisation d'ui-select */ + .tag-input .input-zone { border: 0; - display: inline-block; + display: block; + float: left; width: auto; background: transparent; box-shadow: none; @@ -460,6 +468,10 @@ dl > dd { padding: 0; } +.tag-input .ui-select-bootstrap .ui-select-toggle > .caret { + display: none !important; +} + .tag { background-color: #F5F5F5; border: 1px solid #DDD; @@ -615,7 +627,7 @@ body .container { border-left: 6px solid transparent; border-right: 6px solid transparent; border-top: 7px solid; - margin-left: 8px; + margin-left: 4px; color: #39A0A8; cursor: pointer; } diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 04143b4..7794c5f 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -193,7 +193,7 @@ </label> <div class="col-md-10"> - <div class="form-control tag-input"> + <div class="form-control tag-input clearfix"> <span ng-repeat="keyword in document.keywords" class="tag" aria-hidden="true"> {{keyword}} <button type="button" class="close" title="remove" ng-click="removeKeyword(keyword);"> @@ -203,7 +203,6 @@ <!--<input type="text" class="form-control" name="keywords"--> <!--placeholder="{{ 'placeholder.addKeyword' | translate }}"--> <!--ng-model="toAddKeyword" list="existingKeywords" />--> - <!--FIXME #CSS Leo--> <span class="input-zone"> <ui-select ng-model="toAddKeywords.selected" theme="bootstrap" reset-search-input="true" ng-change="addKeyword(toAddKeywords.selected)"> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 708201d..2481379 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -186,7 +186,7 @@ </label> <div class="col-md-10"> - <div class="form-control tag-input"> + <div class="form-control tag-input clearfix"> <span ng-repeat="keyword in document.keywords" class="tag" aria-hidden="true"> {{keyword}} <button type="button" class="close" title="remove" ng-click="removeKeyword(keyword);"> @@ -197,7 +197,6 @@ <!--<input type="text" class="form-control" name="keywords"--> <!--placeholder="{{ 'placeholder.addKeyword' | translate }}"--> <!--ng-model="toAddKeyword" list="existingKeywords" />--> - <!--FIXME #CSS Leo--> <span class="input-zone"> <ui-select ng-model="toAddKeywords.selected" theme="bootstrap" reset-search-input="true" ng-change="addKeyword(toAddKeywords.selected)"> diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index bc0bf20..db0b27b 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -127,7 +127,7 @@ </label> <div class="col-md-10"> - <div class="form-control tag-input"> + <div class="form-control tag-input clearfix"> <span ng-repeat="theme in question.themes" class="tag" aria-hidden="true"> {{theme}} <button type="button" class="close" title="remove" ng-click="removeTheme(theme);"> @@ -138,7 +138,6 @@ <!--<input type="text" class="form-control" name="themes"--> <!--placeholder="{{ 'placeholder.project.addTag' | translate }}"--> <!--data-ng-model="toAddTheme" list="existingThemes" />--> - <!--FIXME #CSS Leo--> <span class="input-zone"> <ui-select ng-model="toAddTheme.selected" theme="bootstrap" reset-search-input="true" ng-change="addTheme(toAddTheme.selected)"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.