From c2a9faea3ae5985f0cadf665e3f05b2202046fee Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Wed, 22 Mar 2017 11:51:30 +0100 Subject: [PATCH] update css --- .../js/angular/app/Views/signatureBook.html | 10 +++++----- modules/visa/css/module.css | 20 ++++++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html b/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html index 90787be6ec8..73c59939c97 100644 --- a/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html +++ b/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html @@ -21,11 +21,6 @@ </div> </div> <div id="labelSignatureBook" title="{{signatureBook.currentAction.actionLabel}}" ><div>{{signatureBook.currentAction.actionLabel}}</div></div> - <div class="others"> - <span id="consigne"> - <input type="text" value="{{signatureBook.consigne}}" title="Consigne" readonly="readonly"> - </span> - </div> <div class="actions"> <i style="cursor: pointer;vertical-align: middle;" title="Accédez à la fiche détaillée" class="fa fa-info-circle fa-2x" (click)="backToDetails()"></i> <select id="signatureBookActions"> @@ -33,6 +28,11 @@ </select> <input name="send" id="send" value="Valider" class="button" type="button" (click)="validForm()"> </div> + <div class="others"> + <span id="consigne"> + <input type="text" value="{{signatureBook.consigne}}" title="Consigne" readonly="readonly"> + </span> + </div> </div> <div class="contentSignatureBook"> <div class="resListContent" [ngStyle]="{'display': showResLeftPanel ? 'inline-block' : 'none'}" id="resListContent"> diff --git a/modules/visa/css/module.css b/modules/visa/css/module.css index 47135c5842d..a06ea5644cd 100644 --- a/modules/visa/css/module.css +++ b/modules/visa/css/module.css @@ -246,16 +246,17 @@ } .titleSignatureBook .others{ - border-right: solid 1px black; + float:right; + width:10%; padding: 5px; vertical-align: middle; - text-align: right; + text-align: right; } .titleSignatureBook .others input{ + width: 95%; background: #E6E6E6; border-radius: 2px; - width: 350px; border: none; padding: 5px; } @@ -479,11 +480,13 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{ } .actions{ - width: 35%; + float:right; + width: 25%; padding: 5px; vertical-align: middle; text-align: right; text-transform: initial; + border-left: solid 1px black; } .actions i{ width:5%; @@ -509,30 +512,33 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{ text-transform : uppercase; white-space: nowrap; overflow: hidden; - text-overflow: ellipsis; } #closeSignatureBook{ + float:left; padding:5px; width:2%; text-align: center; } #labelSignatureBook{ + float:left; width: 33%; padding-left: 10px; + margin-top: 10px; } #labelSignatureBook div{ - width: 450px; + /*width: 100%;*/ overflow: hidden; text-overflow: ellipsis; display: block; } #tabSignatureBook{ + float:left; width:auto; } .titleSignatureBook div{ - display:table-cell; + display:inline-block; vertical-align: middle; } -- GitLab