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 a7986219f5432e56c1cd2d2150d1081c26521551 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Mon Feb 1 10:25:29 2016 +0100 Corrections graphiques --- coselmar-ui/src/main/webapp/css/coselmar.css | 16 ++++++++++------ .../src/main/webapp/views/documents/toolsPart.html | 8 ++++++-- .../src/main/webapp/views/questions/toolsPart.html | 8 ++++++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index c361f16..c4c485a 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -195,17 +195,17 @@ h2 { background-color: transparent; transition: all 0.4s ease-in-out 0s; border: 1px solid #39a0a8; - color: #39a0a8; + color: #39a0a8 !important; margin-left: 15px; } .btn-action:hover { background-color: #39a0a8 !important; - color: #FFF; + color: #FFF !important; } .btn-action:active, .btn-action:visited { - color: #39a0a8; + color: #39a0a8 !important; } .table .btn-action { @@ -214,7 +214,7 @@ h2 { .btn-edit { - color: #f0ad4e; + color: #f0ad4e !important; border-color: #f0ad4e; } .btn-edit:hover { @@ -222,11 +222,11 @@ h2 { } .btn-edit:active, .btn-edit:visited { - color: #f0ad4e; + color: #f0ad4e !important; } .btn-disable { - color: #d9534f; + color: #d9534f !important; border-color: #d9534f; } .btn-disable:hover { @@ -237,6 +237,10 @@ h2 { padding-right: 5px; } +.input-group-btn button { + height: 34px; +} + /* Forms -------------------------------------------------- */ .requiredField { diff --git a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html index 4a4167a..cfac4a9 100644 --- a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html +++ b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html @@ -36,8 +36,12 @@ {{ 'common.button.searchField' | translate }} <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'common.message.info.searchKeywords' | translate }}"></span> - <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="search.searchKeywords" ng-list /> - <button type="submit" class="btn btn-primary fa fa-search"></button> + <div class="input-group"> + <input type="text" class="form-control" placeholder="keyword1,keyword2,..." ng-model="search.searchKeywords" ng-list /> + <span class="input-group-btn"> + <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button> + </span> + </div> </div> <div class="form-group" ng-show="!advanced"> <a ng-click="searchMode('advanced')" class="btn btn-action"> diff --git a/coselmar-ui/src/main/webapp/views/questions/toolsPart.html b/coselmar-ui/src/main/webapp/views/questions/toolsPart.html index 3e6f317..589979f 100644 --- a/coselmar-ui/src/main/webapp/views/questions/toolsPart.html +++ b/coselmar-ui/src/main/webapp/views/questions/toolsPart.html @@ -35,8 +35,12 @@ <div class="form-group"> {{ 'common.button.searchField' | translate }} <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'common.message.info.searchKeywords' | translate }}"></span> - <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchOptions.fullTextSearch" ng-list /> - <button type="submit" class="btn btn-primary glyphicon glyphicon-search"></button> + <div class="input-group"> + <input type="text" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchOptions.fullTextSearch" ng-list /> + <span class="input-group-btn"> + <button type="submit" class="btn btn-primary glyphicon glyphicon-search"></button> + </span> + </div> </div> <div class="form-group" ng-show="!advanced"> <a ng-click="searchMode('advanced')" class="btn btn-action"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.