This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 1ba692191dc517dffaf775080393d83d930fef3a Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Feb 18 11:21:42 2015 +0100 Display updates --- coselmar-ui/src/main/webapp/css/coselmar.css | 7 +++++-- .../src/main/webapp/views/documents/modalDocumentEdit.html | 6 +++--- .../src/main/webapp/views/documents/modalDocumentSearch.html | 8 ++++---- .../src/main/webapp/views/questions/modalQuestionSearch.html | 8 ++++---- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 71b86fe..9ac6fc8 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -437,6 +437,9 @@ input[type="file"] { height: auto; } +.modal-footer { + text-align: left; +} /* Media queries -------------------------------------------------- */ @@ -469,10 +472,10 @@ input[type="file"] { padding-right: 3px; } .navbar .navbar-nav > li { - border-color: #ddd; + border-color: #EEE; } .navbar .navbar-nav > li:last-child { - border-color: #ddd; + border-color: #EEE; } .navbar .navbar-form.navbar-right .user-info { font-size: 12px; diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index 8b30580..5366525 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -142,7 +142,7 @@ </div> </div> <p ng-show="!document.externalUrl && !file.upload" - class="help-block text-center">{{ 'document.message.requiredExternalUrlOrFile' | translate }}</p> + class="help-block text-center clear">{{ 'document.message.requiredExternalUrlOrFile' | translate }}</p> </div> <!-- End Line with file and externalURL --> @@ -276,8 +276,8 @@ </div> <div class="modal-footer"> - <input type="submit" class="btn btn-primary" /> - <button class="btn btn-warning" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> + <button class="btn btn-action btn-disable" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> + <input type="submit" value="Submit" class="btn btn-action btn-success float-right" /> </div> </form> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html index 1620e5c..b190606 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html @@ -22,15 +22,15 @@ #L% --> -<div style="padding: 0px 0px 0px 30px"> - <div class="page-header"> +<div> + <div class="modal-title"> <h1> <!-- Heading goes here --> {{ 'document.modalSearch.title' | translate }} </h1> </div> - <div> + <div class="modal-body"> <div> <form class="form-inline pull-right" role="documentOptions" ng-submit="searchDocuments(searchKeywords)"> <div class="form-group"> @@ -66,6 +66,6 @@ <p ng-if="documents && documents.length == 0" translate="common.search.noResult" class="info"/> </div> <div class="modal-footer"> - <button class="btn btn-warning" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> + <button class="btn btn-action btn-disable" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> </div> </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html index 0f98263..8604653 100644 --- a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html +++ b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html @@ -21,15 +21,15 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> - <div class="page-header"> +<div> + <div class="modal-title"> <h1> <!-- Heading goes here --> {{ 'question.modal.parents.title' | translate }} </h1> </div> - <div> + <div class="modal-body"> <div> <form class="form-inline pull-right" role="questionOptions" ng-submit="searchQuestions(searchKeywords)"> <div class="form-group"> @@ -67,6 +67,6 @@ <p ng-if="questions && questions.length == 0" translate="common.search.noResult" class="info"/> </div> <div class="modal-footer"> - <button class="btn btn-warning" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> + <button class="btn btn-action btn-disable" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> </div> </div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.