From 072f2f7cfb9affc53d07f27e8e667d74f7b1c05d Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 14 Mar 2017 14:06:32 +0100
Subject: [PATCH] update css
---
.../js/angular/app/Views/signatureBook.html | 10 +++---
modules/visa/css/module.css | 35 ++++++++++++-------
2 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html b/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
index 937840f5ccf..39c84593a91 100644
--- a/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
+++ b/apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
@@ -38,7 +38,7 @@
<div class="resListContentFrame" *ngFor="let res of signatureBook.resList" (click)="changeLocation(res.res_id)" [ngClass]="{'resListContentFrameSelected': resId == res.res_id}">
<div class="resListContentInfo">
<i class="fa fa-compass" title="Numéro chrono"></i> {{res.alt_identifier}}
- <i ng-if="res.allSigned" class="fa fa-certificate" style="position: absolute;bottom: 35px;right: 50px;font-size: 40px;color: gold;"></i>
+ <i ng-if="res.allSigned" class="fa fa-certificate" style="position: absolute;bottom: 65px;right: 50px;font-size: 20px;color: #FDD16C;"></i>
<i class="fa fa-circle" aria-hidden="true" [ngStyle]="{'color': res.priorityColor}" style="position: absolute;right: 0px;top: -10px;font-size: 25px;"></i>
</div>
<div class="resListContentInfo">
@@ -63,7 +63,7 @@
<div (click)="displayPanel('TOPLEFT')" *ngIf="!showTopLeftPanel" style="padding: 5px;cursor:pointer;">
<strong>{{signatureBook.documents.length - 1}} pièce(s) jointe(s)</strong>
</div>
- <div *ngIf="showTopLeftPanel">
+ <div *ngIf="showTopLeftPanel" style="height:100%;">
<img id="thumnails_img" *ngFor="let document of signatureBook.documents; let i = index" (click)="changeLeftViewer(i)" [src]="document.thumbnailLink"
class="leftPanelThumbnails" [ngClass]="{'panelSelectedThumbnail': i == leftSelectedThumbnail}"/>
</div>
@@ -124,7 +124,7 @@
</div>
<div class="infoPj">
<label>Créé le: </label>
- <span>{{signatureBook.attachments[rightSelectedThumbnail].creation_date | date:'dd/MM/y'}}</span>
+ <span>{{signatureBook.attachments[rightSelectedThumbnail].creation_date | date:'dd/MM/y à HH:mm'}}</span>
</div>
<div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].updated_by}}">
<label>Modifié par : </label>
@@ -144,8 +144,8 @@
</div>
</div>
</div>
- <div (click)="editAttachmentIframe(signatureBook.attachments[rightSelectedThumbnail])">EDIT</div>
- <div (click)="delAttachment(signatureBook.attachments[rightSelectedThumbnail])">SUPPRIMER</div>
+ <div title="Modifier la pièce jointe" style="cursor: pointer;position: absolute;right: -30px;bottom: 70px;padding: 10px;background-color: #009DC5;color: white;border-radius: 25px;-moz-box-shadow: 0px 0px 10px 0px #656565;-webkit-box-shadow: 0px 0px 10px 0px #656565;-o-box-shadow: 0px 0px 10px 0px #656565;box-shadow: 0px 0px 10px 0px #656565;filter: progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=NaN, Strength=10);" (click)="editAttachmentIframe(signatureBook.attachments[rightSelectedThumbnail])"><i class="fa fa-pencil-square-o fa-2x"></i></div>
+ <div title="Supprimer la pièce jointe" style="cursor: pointer;position: absolute;right: -30px;top: 70px;padding: 10px;background-color: red;color: white;border-radius: 25px;-moz-box-shadow: 0px 0px 10px 0px #656565;-webkit-box-shadow: 0px 0px 10px 0px #656565;-o-box-shadow: 0px 0px 10px 0px #656565;box-shadow: 0px 0px 10px 0px #656565;filter: progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=NaN, Strength=10);" (click)="delAttachment(signatureBook.attachments[rightSelectedThumbnail])"><i class="fa fa-trash fa-2x"></i></div>
<div class="pjDetailsMore" (click)="displayPanel('TOPRIGHT')">
<i *ngIf="!showTopRightPanel" class="fa fa-chevron-down" aria-hidden="true"></i>
<i *ngIf="showTopRightPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
diff --git a/modules/visa/css/module.css b/modules/visa/css/module.css
index eaea9923dd8..4619b469903 100644
--- a/modules/visa/css/module.css
+++ b/modules/visa/css/module.css
@@ -286,14 +286,14 @@
}
.resListContentFrame:hover{
- background-color: #009DC5;
- color: white;
+ background-color: #FDD16C;
}
.resListContentFrame{
border-bottom : solid 1px black;
position:relative;
overflow: hidden;
+ background-color: white;
}
.resListContentPos{
@@ -346,6 +346,7 @@
text-align: center;
position: absolute;
right: -1px;
+ background-color: white;
}
.panelRightContent{
@@ -382,6 +383,7 @@
}
.pjDetails,.pjSign,.pjCreate{
+ background-color:white;
display: block;
width: 97%;
text-align: left;
@@ -393,7 +395,7 @@
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
- padding: 10px;
+ padding:10px;
height:30px;
}
@@ -435,6 +437,7 @@
.pjDoc{
height: 30px;
+ background-color: white;
-moz-box-shadow: inset 0px 0px 5px 0px #656565;
-webkit-box-shadow: inset 0px 0px 5px 0px #656565;
-o-box-shadow: inset 0px 0px 5px 0px #656565;
@@ -476,12 +479,11 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
.titleSignatureBook{
display: table;
- border-radius: 0px 0px 20px;
- width:40%;
+ width:100%;
border-right: solid 1px black;
border-top: solid 1px black;
border-left: solid 1px black;
- padding: 5px;
+ /*padding: 5px;*/
vertical-align: middle;
font-weight: bold;
background: #009DC5;
@@ -495,6 +497,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
.titleSignatureBook span{
display: table-cell;
vertical-align: middle;
+ padding:5px;
}
.titleSignatureBook span:nth-child(2){
@@ -518,6 +521,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
height:85vh;
white-space: nowrap;
overflow: hidden;
+ background-color: #CEE9F1;
}
.headerSignatureBook .item{
@@ -527,6 +531,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
cursor: pointer;
width: 5%;
vertical-align: middle;
+ background-color: #deedf3;
}
.headerSignatureBook .activeTabSignatureBook i{
@@ -540,13 +545,17 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
font-weight: bold;
}
-.headerSignatureBook .item.activeTabSignatureBook,.panelRight .panelSelectedThumbnail,.resListContentFrameSelected{
- background: #009DC5;
- color:white;
+.headerSignatureBook .item.activeTabSignatureBook,.panelRight .panelSelectedThumbnail{
+ /*background: #009DC5;
+ color:white;*/
-moz-box-shadow: inset 0px 0px 5px 0px #656565;
--webkit-box-shadow: inset 0px 0px 5px 0px #656565;
--o-box-shadow: inset 0px 0px 5px 0px #656565;
-box-shadow: inset 0px 0px 5px 0px #656565;
+ -webkit-box-shadow: inset 0px 0px 5px 0px #656565;
+ -o-box-shadow: inset 0px 0px 5px 0px #656565;
+ box-shadow: inset 0px 0px 5px 0px #656565;
+}
+
+.resListContentFrameSelected,.panelSelectedThumbnail{
+ background-color: #FDD16C;
}
.panelRightAddPj{
@@ -766,4 +775,4 @@ box-shadow: inset 0px 0px 5px 0px #656565;
/*.showLeftPanel.contentRight{*/
/*width:46.5%;*/
-/*}*/
+/*}*/
--
GitLab