From 6afc20d79ee76b38a887f75f61ee34695474cb7e Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 21 Mar 2019 17:39:25 +0100
Subject: [PATCH] FEAT #9107 front shipping action
---
.../send-shipping-action.component.html | 73 +++++++++----------
.../send-shipping-action.component.scss | 16 ++--
2 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html b/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html
index 0d970ba8c5a..4cabb133c92 100644
--- a/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html
+++ b/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.html
@@ -42,6 +42,9 @@
{{lang.pricesInformations}} *
</div>
<div class="priceContent">
+ <div class="priceInfo">
+ * Selon les paramètres définis dans le modèle
+ </div>
<mat-form-field appearance="outline">
<input matInput [(ngModel)]="totalPrice" required name="totalPrice" id="totalPrice"
title="Prix total" type="number" disabled>
@@ -49,9 +52,6 @@
</mat-form-field>
</div>
</div>
- <div class="priceInfo">
- * Selon les paramètres définis dans le modèle
- </div>
</div>
<div class="col-md-12">
@@ -60,42 +60,37 @@
</div>
</mat-sidenav-content>
<mat-sidenav mode="side" fixedTopGap="56" position='end' opened style="width: 50%;">
- <div class="formType" style="flex-direction: column;">
- <div class="formType-title">
- Pièce(s) jointe(s)
- </div>
- <div class="pjList">
- <span>
- 80x80
- </span>
- <span>
- 80x80
- </span>
- <span>
- 80x80
- </span>
- <span>
- 80x80
- </span>
- <span>
- 80x80
- </span>
- <span>
- 80x80
- </span>
- <span>
- 80x80
- </span>
- <span>
- 80x80
- </span>
- <span>
- 80x80
- </span>
- <span>
- 80x80
- </span>
- </div>
+ <div class="pjList">
+ <span>
+ 80x80
+ </span>
+ <span>
+ 80x80
+ </span>
+ <span>
+ 80x80
+ </span>
+ <span>
+ 80x80
+ </span>
+ <span>
+ 80x80
+ </span>
+ <span>
+ 80x80
+ </span>
+ <span>
+ 80x80
+ </span>
+ <span>
+ 80x80
+ </span>
+ <span>
+ 80x80
+ </span>
+ <span>
+ 80x80
+ </span>
</div>
</mat-sidenav>
</mat-sidenav-container>
diff --git a/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.scss b/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.scss
index 6665dfc2218..cedaa99da92 100644
--- a/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.scss
+++ b/src/frontend/app/actions/send-shipping-action/send-shipping-action.component.scss
@@ -5,7 +5,7 @@
}
.loading {
- display:flex;
+ display: flex;
position: absolute;
top: 0;
left: 0;
@@ -101,22 +101,24 @@
}
.priceInfo {
- padding-left: 30px;
+ padding-right: 20px;
font-size: 10px;
opacity: 0.5;
- margin-top: -10px;
- padding-bottom: 10px;
}
.pjList {
display: flex;
width: 100%;
overflow: auto;
+ flex-direction: column;
+
span {
- margin: 5px;
display: block;
- height: 80px;
- width: 50px;
+ height: 100vh;
+ width: 90%;
border: solid 1px black;
+ margin: auto;
+ margin-bottom: auto;
+ margin-bottom: 10px;
}
}
\ No newline at end of file
--
GitLab