Skip to content

Commit b61aa10

Browse files
mattbollmattboll
committed
Merge branch 'release/2024.11.14'
2 parents 12e45e3 + 8f14899 commit b61aa10

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

‎dossierfacile-bo/src/main/resources/static/css/process-file.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,12 @@
112112
}
113113

114114
.header-tenant-info {
115-
position: sticky;
115+
@media (min-width: 900px) {
116+
position: sticky;
117+
left: 0;
118+
top: 60px;
119+
right: 0;
120+
}
116121
width: 100%;
117122
min-width: fit-content;
118123
z-index: 1;

‎dossierfacile-bo/src/main/resources/templates/bo/process-file-layout.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
<head>
66
<head th:replace="~{include/process-file-layout-head :: head}"></head>
77
</head>
8-
<div class="container-fluid">
9-
<div layout:fragment="header">
10-
<div th:replace="~{include/fixed-header-bo :: fixed-header-bo}">...</div>
11-
</div>
12-
</div>
13-
<body class="bg-body-secondary">
8+
<body class="bg-body-secondary container-fluid">
9+
<header layout:fragment="header" class="fixed-header">
10+
<div th:replace="~{include/fixed-header-bo :: fixed-header-bo}">...</div>
11+
</header>
1412
<div layout:fragment="content"></div>
1513
<div th:replace="~{include/scripts-bo :: script-bo}">...</div>
1614
<div layout:fragment="javascripts">

‎dossierfacile-bo/src/main/resources/templates/bo/process-file.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565

6666
<div th:each="messageItem, i:${customMessage.getMessageItems()}" th:remove="tag">
6767
<div class="row mt-4">
68-
<div class="col-md-8" style="min-height: 700px" th:if="${messageItem.getCustomTex()}==null">
68+
<div class="col-md-8" style="min-height: 700px; max-height: 1050px" th:if="${messageItem.getCustomTex()}==null">
6969
<embed class="document-embed" height="100%"
7070
th:src="'/pdf-viewer/pdfjs-dist/web/viewer.html?file=/documents/'+${messageItem.getDocumentName()}"
7171
width="100%"/>
7272
</div>
73-
<div class="col-md-8" style="min-height: 700px" th:if="${messageItem.getCustomTex()}!=null">
73+
<div class="col-md-8" style="min-height: 700px; max-height: 1050px" th:if="${messageItem.getCustomTex()}!=null">
7474
<div class="full-size-div">
7575
<div class="card-div">
7676
<div class="card" style="background-color: rgb(232, 237, 241)">
@@ -85,7 +85,7 @@ <h3 class="h3-style">Texte du document :</h3>
8585
<div class="display-flex flex-grow-1 margin-top-25px overflow-auto padding-right-0px"
8686
style="align-self: flex-start;">
8787
<div class="padding-right-5px">
88-
<div class="file1-border-color">
88+
<div class="card file1-border-color">
8989
<div class="card-header file1-border-color bold"
9090
th:classappend="${'category-' + messageItem.getDocumentCategory()}">
9191
<div class="letter" style="color: #0a0808">
@@ -181,7 +181,7 @@ <h4>Lecture automatiques :</h4>
181181
<input th:field="*{messageItems[__${i.index}__].documentId}"
182182
th:value="${messageItem.getDocumentId()}" type="hidden"/>
183183
<div class="margin-bottom mt-4">
184-
<div class="form-check mb-2 ms-2"
184+
<div class="form-check mb-3 ms-2"
185185
th:each="itemDetail,j : ${messageItem.getItemDetailList()}">
186186
<label class="form-check-label"
187187
>
@@ -217,12 +217,12 @@ <h4>Lecture automatiques :</h4>
217217
<div th:each="messageItem, i:${guarantorItem.getMessageItems()}" th:remove="tag">
218218
<div class="row mt-4">
219219

220-
<div class="col-md-8" style="min-height: 700px" th:if="${messageItem.getCustomTex()}==null">
220+
<div class="col-md-8" style="min-height: 700px; max-height: 1050px" th:if="${messageItem.getCustomTex()}==null">
221221
<embed class="document-embed" height="100%"
222222
th:src="'/pdf-viewer/pdfjs-dist/web/viewer.html?file=/documents/'+${messageItem.getDocumentName()}"
223223
width="100%"/>
224224
</div>
225-
<div class="col-md-8" style="min-height: 700px" th:if="${messageItem.getCustomTex()}!=null">
225+
<div class="col-md-8" style="min-height: 700px; max-height: 1050px" th:if="${messageItem.getCustomTex()}!=null">
226226
<div class="full-size-div">
227227
<div class="card-div">
228228
<div class="card" style="background-color: rgb(232, 237, 241)">
@@ -355,7 +355,7 @@ <h4>Lecture automatiques :</h4>
355355
<input th:field="*{guarantorItems[__${k.index}__].messageItems[__${i.index}__].documentId}"
356356
th:value="${messageItem.getDocumentId()}" type="hidden"/>
357357
<div class="margin-bottom mt-4">
358-
<div class="form-check mb-2 ms-2"
358+
<div class="form-check mb-3 ms-2"
359359
th:each="itemDetail,j : ${messageItem.getItemDetailList()}">
360360
<label class="form-check-label"
361361
>

0 commit comments

Comments
 (0)