Skip to content

Commit f1b4f7a

Browse files
authored
Merge pull request #3413 from ProgrammeVitam/bug_15495
Bug #15495 - [Search + Collect] Display bug on the filter-saving pop-up.
2 parents c70dfa6 + 999decb commit f1b4f7a

28 files changed

+394
-686
lines changed
Binary file not shown.

cas/cas-server/src/main/resources/static/icons/fonts/vitamui-icon.svg

Lines changed: 1 addition & 0 deletions
Loading
Binary file not shown.
Binary file not shown.

cas/cas-server/src/main/resources/static/icons/vitamui-icons.css

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@font-face {
22
font-family: 'vitamui-icon';
3-
src: url('fonts/vitamui-icon.eot?b1hl71');
4-
src: url('fonts/vitamui-icon.eot?b1hl71#iefix') format('embedded-opentype'),
5-
url('fonts/vitamui-icon.ttf?b1hl71') format('truetype'),
6-
url('fonts/vitamui-icon.woff?b1hl71') format('woff'),
7-
url('fonts/vitamui-icon.svg?b1hl71#vitamui-icon') format('svg');
3+
src: url('fonts/vitamui-icon.eot?u6sheu');
4+
src: url('fonts/vitamui-icon.eot?u6sheu#iefix') format('embedded-opentype'),
5+
url('fonts/vitamui-icon.ttf?u6sheu') format('truetype'),
6+
url('fonts/vitamui-icon.woff?u6sheu') format('woff'),
7+
url('fonts/vitamui-icon.svg?u6sheu#vitamui-icon') format('svg');
88
font-weight: normal;
99
font-style: normal;
1010
font-display: block;
@@ -25,6 +25,10 @@ i.vitamui-icon {
2525
-moz-osx-font-smoothing: grayscale;
2626
}
2727

28+
.vitamui-icon-save:before {
29+
content: "\e97a";
30+
color: #757575;
31+
}
2832
.vitamui-icon-ic24-arborescence:before {
2933
content: "\e961";
3034
}

ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy, Aft
724724

725725
openCriteriaPopup(searchCriteriaHistory$: SearchCriteriaHistory) {
726726
const dialogConfig: MatDialogConfig = {
727-
panelClass: 'p-0',
727+
panelClass: ['p-0', 'search-criteria-dialog'],
728728
disableClose: false,
729729
data: {
730730
searchCriteriaHistory: searchCriteriaHistory$,
Lines changed: 33 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,25 @@
1-
.button-content {
2-
border-radius: 7px;
3-
padding-left: 10px;
4-
padding-right: 10px;
5-
max-width: 400px;
6-
font-weight: bold;
7-
height: 60px;
1+
.rd-2 {
2+
border-radius: 10px;
83
}
94

105
.no-results-center {
116
text-align: center;
127
}
138

14-
.scroll {
15-
overflow-y: scroll;
16-
height: 600px;
17-
width: 600px;
18-
}
19-
20-
.scroll::-webkit-scrollbar {
21-
width: 12px;
22-
}
23-
24-
.scroll::-webkit-scrollbar-track {
25-
background: var(--vitamui-primary-50);
26-
}
27-
28-
.scroll::-webkit-scrollbar-thumb {
29-
background-color: var(--vitamui-primary);
30-
border-radius: 20px;
31-
border: 3px solid var(--vitamui-primary-50);
32-
}
33-
34-
.pad {
35-
padding: 0;
36-
margin: auto;
37-
height: 600px;
9+
.triangle {
10+
position: relative;
11+
color: white;
12+
max-width: 10%;
13+
top: 100px;
14+
left: 15px;
15+
border: 28px solid transparent;
16+
border-left-color: var(--vitamui-grey-200);
3817
}
3918

4019
.rectangle {
4120
background: var(--vitamui-grey-200);
4221
}
4322

44-
.actif-filters {
45-
padding-top: 40px;
46-
padding-left: 14px;
47-
padding-bottom: 25px;
48-
font-size: larger;
49-
font-weight: bold;
50-
}
51-
52-
.sauvegarde-text {
53-
font-size: 21px;
54-
font-weight: bold;
55-
}
56-
57-
.pad5 {
58-
padding-bottom: 10px;
59-
}
60-
6123
.border-results {
6224
left: 0;
6325
right: 0;
@@ -66,161 +28,44 @@
6628
border: 1px solid var(--vitamui-grey-400);
6729
box-sizing: border-box;
6830
border-radius: 10px;
69-
margin-top: 17px;
70-
}
71-
72-
.scroll-results {
73-
height: 285px;
74-
width: 107%;
75-
padding-left: 25px;
76-
overflow-y: scroll;
77-
scrollbar-color: var(--vitamui-primary-400) var(--vitamui-primary-50);
78-
scrollbar-width: thin;
79-
}
80-
81-
.scroll-results::-webkit-scrollbar {
82-
width: 12px;
83-
}
84-
85-
.scroll-results::-webkit-scrollbar-track {
86-
background: var(--vitamui-white);
87-
}
88-
89-
.scroll-results::-webkit-scrollbar-thumb {
90-
background-color: var(--vitamui-primary-400);
91-
border-radius: 20px;
92-
border: 3px solid var(--vitamui-white);
93-
}
94-
95-
.btn-create {
96-
text-align: right;
97-
}
98-
99-
.pink-color {
100-
background: var(--vitamui-primary-50);
101-
}
102-
103-
.boutton:focus {
104-
outline: none;
105-
}
106-
107-
.ko-icon {
108-
color: var(--vitamui-red);
109-
right: 5px;
110-
}
111-
112-
.warning {
113-
padding-top: 5px;
114-
}
115-
116-
.save-icon {
117-
color: var(--vitamui-grey);
118-
font-size: 35px;
119-
}
120-
121-
.pad-bottom {
122-
padding-bottom: 10px;
123-
padding-left: 5%;
124-
}
125-
126-
.triangle {
127-
position: relative;
128-
color: white;
129-
max-width: 10%;
130-
top: 134px;
131-
border: 28px solid transparent;
132-
border-left-color: var(--vitamui-grey-200);
133-
}
134-
135-
.scroll-filters {
136-
height: 470px;
137-
overflow-y: scroll;
138-
overflow-x: hidden;
139-
scrollbar-color: var(--vitamui-primary-400) var(--vitamui-primary-50);
140-
scrollbar-width: thin;
141-
}
142-
143-
.scroll-filters::-webkit-scrollbar {
144-
width: 12px;
145-
}
146-
147-
.scroll-filters::-webkit-scrollbar-track {
148-
background: var(--vitamui-primary-50);
149-
}
150-
151-
.scroll-filters::-webkit-scrollbar-thumb {
152-
background-color: var(--vitamui-primary-400);
153-
border-radius: 20px;
154-
border: 3px solid var(--vitamui-primary-50);
155-
}
156-
157-
.results-message {
158-
font-weight: bold;
159-
padding-left: 5px;
160-
font-style: normal;
161-
font-size: 16px;
162-
line-height: 22px;
16331
}
16432

165-
.results-nb-filters {
166-
font-style: normal;
167-
font-weight: normal;
168-
font-size: 14px;
169-
line-height: 22px;
170-
color: var(--vitamui-grey-700);
171-
}
172-
173-
.div-update {
174-
padding-left: 38px;
175-
}
176-
177-
.confirm-update {
178-
padding-left: 35px;
179-
padding-top: 10px;
180-
}
181-
182-
.pad-actions {
183-
padding-left: 30px;
184-
}
185-
186-
.pad-results {
187-
padding-top: 12px;
188-
padding-bottom: 12px;
33+
.btn .vitamui-icon {
34+
color: var(--vitamui-grey-600) !important;
35+
width: 40px !important;
36+
height: 40px !important;
18937
}
19038

19139
.hover-div:hover {
19240
background: var(--vitamui-grey-200);
19341
border-radius: 10px;
19442
}
19543

196-
.btn-result-update:hover {
197-
background: var(--vitamui-grey-200);
44+
.no-scroll-results {
45+
height: 283px;
46+
padding-left: 25px;
47+
overflow-y: hidden;
19848
}
19949

200-
.btn-no-result {
201-
font-size: 20px;
202-
padding-top: 13px;
203-
color: var(--vitamui-grey-700);
50+
.filtre-list-container {
51+
min-height: 400px;
52+
max-height: 400px;
53+
overflow-y: auto;
20454
}
20555

206-
.warning-message {
207-
font-family: Mulish;
208-
font-style: normal;
209-
font-weight: normal;
210-
font-size: 13px;
211-
line-height: 16px;
212-
letter-spacing: -0.2px;
213-
}
56+
.vitamui-elements-selected {
57+
background: var(--vitamui-primary-50);
21458

215-
.no-scroll-results {
216-
height: 283px;
217-
padding-left: 25px;
218-
overflow-y: hidden;
59+
&:hover {
60+
background: var(--vitamui-primary-50);
61+
}
21962
}
22063

221-
.scroll-div {
222-
height: 470px;
223-
overflow-y: hidden;
224-
overflow-x: hidden;
64+
.w-400 {
65+
width: 400px;
22566
}
22667

68+
.close-button {
69+
right: 20px;
70+
top: 20px;
71+
}

0 commit comments

Comments
 (0)