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 39d08003bd21b38ff01d77edc38f65df586df6d1 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Feb 19 17:52:36 2015 +0100 Display improvments --- coselmar-ui/src/main/webapp/css/coselmar.css | 10 ++++------ coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 2 +- coselmar-ui/src/main/webapp/views/documents/documents.html | 2 +- coselmar-ui/src/main/webapp/views/questions/questions.html | 2 +- coselmar-ui/src/main/webapp/views/referential/referential.html | 2 +- coselmar-ui/src/main/webapp/views/users/searchPart.html | 4 ++-- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 6e60ab3..ea8d217 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -217,9 +217,11 @@ h2 { text-align: center; } -.actions .btn { +.actions .btn, +.modal-footer .btn{ background-color: #FFF; box-shadow: -2px -1px 8px rgba(0, 0, 0, 0.15) inset; + border-color: initial } /* Document & question view @@ -293,7 +295,7 @@ dl > dd { box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1); } -.search-zone .btn { +.search-zone .btn-action { background: #FFF; } @@ -404,10 +406,6 @@ body .container { background: #39A0A8; } -#main-container .btn-primary { - padding: 3px 10px; -} - .caret { border-left: 6px solid transparent; border-right: 6px solid transparent; diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index b988fa8..e5a4a31 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -1568,7 +1568,7 @@ coselmarControllers.directive('ngConfirmClick', ['$modal', function($modal) { var modalHtml = '<div class="modal-title"><h2>Confirm Action</h2></div>'; modalHtml += '<div class="modal-body"> {{\'' + message + '\' | translate}}</div>'; - modalHtml += '<div class="modal-footer"><button class="btn btn-primary float-right" ng-click="ok()">OK</button><button class="btn btn-warning" ng-click="cancel()">{{ \'common.button.cancel\' | translate }}</button></div>'; + modalHtml += '<div class="modal-footer"><button class="btn btn-action btn-success float-right" ng-click="ok()">OK</button><button class="btn btn-action btn-disable" ng-click="cancel()">{{ \'common.button.cancel\' | translate }}</button></div>'; var modalInstance = $modal.open({ template: modalHtml, diff --git a/coselmar-ui/src/main/webapp/views/documents/documents.html b/coselmar-ui/src/main/webapp/views/documents/documents.html index 86f5502..a42e6ed 100644 --- a/coselmar-ui/src/main/webapp/views/documents/documents.html +++ b/coselmar-ui/src/main/webapp/views/documents/documents.html @@ -40,7 +40,7 @@ <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchKeywords" ng-list /> </div> <div class="form-group"> - <button type="submit" class="btn btn-default glyphicon glyphicon-search"></button> + <button type="submit" class="btn btn-primary glyphicon glyphicon-search"></button> </div> </form> </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index dd16287..895198f 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -41,7 +41,7 @@ <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchOptions.keywords" ng-list /> </div> <div class="form-group"> - <button type="submit" class="btn btn-default glyphicon glyphicon-search"></button> + <button type="submit" class="btn btn-primary glyphicon glyphicon-search"></button> </div> </form> </div> diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index 7dfb30b..b19fdf9 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -53,7 +53,7 @@ </div> <div class="col-md-2"> - <a class="btn btn-action btn-success" ng-click="searchInReferential()"> + <a class="btn btn-primary" ng-click="searchInReferential()"> <span class="fa fa-search" aria-hidden="true"></span>{{ 'common.button.search' | translate }} </a> diff --git a/coselmar-ui/src/main/webapp/views/users/searchPart.html b/coselmar-ui/src/main/webapp/views/users/searchPart.html index 9f4e18d..bd65cfc 100644 --- a/coselmar-ui/src/main/webapp/views/users/searchPart.html +++ b/coselmar-ui/src/main/webapp/views/users/searchPart.html @@ -43,7 +43,7 @@ <input type="search" class="form-control" placeholder="Search an user" ng-model="search.searchKeyword" /> </div> <div class="form-group"> - <button type="submit" class="btn btn-default glyphicon glyphicon-search"></button> + <button type="submit" class="btn btn-primary glyphicon glyphicon-search"></button> </div> <div class="form-group" ng-show="!advanced"> <a ng-click="advanced=true" class="btn btn-action"><span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> {{ 'common.button.advanceSearch' | translate }}</a> @@ -114,7 +114,7 @@ </div> <div class="col-md-3 text-right"> - <button type="submit" class="btn btn-default fa fa-search" ng-click="advancedSearchUsers()">Search</button> + <button type="submit" class="btn btn-primary glyphicon glyphicon-search" ng-click="advancedSearchUsers()"><span class="paddingLeft10">Search</span></button> </div> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.