From a24edcfa60ee13ec703124fd3b0abbacae8f5ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 11 Apr 2022 15:25:17 +0300 Subject: [PATCH 01/10] RED-3738: Removed selectAnnotations event emitter --- .../annotations-list.component.ts | 3 +- .../file-workload.component.html | 3 +- .../file-workload/file-workload.component.ts | 25 +++++----- .../file-preview-screen.component.html | 1 - .../file-preview-screen.component.ts | 10 ---- .../services/pdf-viewer.service.ts | 50 ++++++++++++------- libs/common-ui | 2 +- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts index 640fc46f2..50a23def5 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts @@ -32,7 +32,6 @@ export class AnnotationsListComponent extends HasScrollbarDirective implements O @Input() activeViewerPage: number; @Output() readonly pagesPanelActive = new EventEmitter(); - @Output() readonly selectAnnotations = new EventEmitter(); highlightGroups$ = new BehaviorSubject([]); @@ -82,7 +81,7 @@ export class AnnotationsListComponent extends HasScrollbarDirective implements O if (canMultiSelect && ($event?.ctrlKey || $event?.metaKey) && this._listingService.selected.length > 0) { this._multiSelectService.activate(); } - this.selectAnnotations.emit([annotation]); + this._pdf.selectAnnotations([annotation]); } } diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html index e8b918261..55cbdb3e3 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html @@ -48,7 +48,7 @@
@@ -213,7 +213,6 @@ ; @Input() file!: File; @Input() annotationActionsTemplate: TemplateRef; - @Output() readonly selectAnnotations = new EventEmitter(); @Output() readonly selectPage = new EventEmitter(); displayedPages: number[] = []; pagesPanelActive = true; @@ -78,7 +77,7 @@ export class FileWorkloadComponent { readonly fileDataService: FileDataService, readonly viewModeService: ViewModeService, readonly listingService: ListingService, - private readonly _pdf: PdfViewer, + readonly pdf: PdfViewer, private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _annotationProcessingService: AnnotationProcessingService, ) { @@ -122,7 +121,7 @@ export class FileWorkloadComponent { return this.multiSelectService.inactive$.pipe( tap(value => { if (value) { - this.selectAnnotations.emit(); + this.pdf.selectAnnotations(); } }), shareDistinctLast(), @@ -167,11 +166,11 @@ export class FileWorkloadComponent { } selectAllOnActivePage() { - this.selectAnnotations.emit(this.activeAnnotations); + this.pdf.selectAnnotations(this.activeAnnotations); } deselectAllOnActivePage(): void { - this._pdf.deselectAnnotations(this.activeAnnotations); + this.pdf.deselectAnnotations(this.activeAnnotations); } @HostListener('window:keyup', ['$event']) @@ -279,18 +278,18 @@ export class FileWorkloadComponent { if (!this._firstSelectedAnnotation || this.activeViewerPage !== this._firstSelectedAnnotation.pageNumber) { if (this.displayedPages.indexOf(this.activeViewerPage) !== -1) { // Displayed page has annotations - return this.selectAnnotations.emit(this.activeAnnotations ? [this.activeAnnotations[0]] : null); + return this.pdf.selectAnnotations(this.activeAnnotations ? [this.activeAnnotations[0]] : null); } // Displayed page doesn't have annotations if ($event.key === 'ArrowDown') { const nextPage = this._nextPageWithAnnotations(); - this.selectAnnotations.emit([this.displayedAnnotations.get(nextPage)[0]]); + this.pdf.selectAnnotations([this.displayedAnnotations.get(nextPage)[0]]); return; } const prevPage = this._prevPageWithAnnotations(); const prevPageAnnotations = this.displayedAnnotations.get(prevPage); - this.selectAnnotations.emit([prevPageAnnotations[prevPageAnnotations.length - 1]]); + this.pdf.selectAnnotations([prevPageAnnotations[prevPageAnnotations.length - 1]]); return; } @@ -304,13 +303,13 @@ export class FileWorkloadComponent { if ($event.key === 'ArrowDown') { if (idx + 1 !== annotationsOnPage.length) { // If not last item in page - this.selectAnnotations.emit([annotationsOnPage[idx + 1]]); + this.pdf.selectAnnotations([annotationsOnPage[idx + 1]]); } else if (nextPageIdx < this.displayedPages.length) { // If not last page for (let i = nextPageIdx; i < this.displayedPages.length; i++) { const nextPageAnnotations = this.displayedAnnotations.get(this.displayedPages[i]); if (nextPageAnnotations) { - this.selectAnnotations.emit([nextPageAnnotations[0]]); + this.pdf.selectAnnotations([nextPageAnnotations[0]]); break; } } @@ -320,7 +319,7 @@ export class FileWorkloadComponent { if (idx !== 0) { // If not first item in page - return this.selectAnnotations.emit([annotationsOnPage[idx - 1]]); + return this.pdf.selectAnnotations([annotationsOnPage[idx - 1]]); } if (pageIdx) { @@ -328,7 +327,7 @@ export class FileWorkloadComponent { for (let i = previousPageIdx; i >= 0; i--) { const prevPageAnnotations = this.displayedAnnotations.get(this.displayedPages[i]); if (prevPageAnnotations) { - this.selectAnnotations.emit([prevPageAnnotations[prevPageAnnotations.length - 1]]); + this.pdf.selectAnnotations([prevPageAnnotations[prevPageAnnotations.length - 1]]); break; } } @@ -376,7 +375,7 @@ export class FileWorkloadComponent { this.displayedPages.indexOf(this.activeViewerPage) >= 0 && this.activeAnnotations.length > 0 ) { - this.selectAnnotations.emit([this.activeAnnotations[0]]); + this.pdf.selectAnnotations([this.activeAnnotations[0]]); } } diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html index 49de602a9..28f4c98d6 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html @@ -87,7 +87,6 @@ , private readonly _logger: NGXLogger, ) { this.documentLoaded$ = this.#documentLoaded$.asObservable().pipe( @@ -178,25 +181,15 @@ export class PdfViewer { this.annotationManager?.deselectAllAnnotations(); } - selectAnnotations(annotations: AnnotationWrapper[], multiSelectActive: boolean = false) { - if (!annotations) { - return; - } - - const filteredAnnotations = annotations.filter(a => !!a); - - if (!filteredAnnotations.length) { - return; - } - - if (!multiSelectActive) { + selectAnnotations(annotations?: AnnotationWrapper[]) { + if (annotations) { + const annotationsToSelect = this._multiSelectService.isActive + ? [...this._listingService.selected, ...annotations] + : annotations; + this.#selectAnnotations(annotationsToSelect); + } else { this.deselectAllAnnotations(); } - - const annotationsFromViewer = this.getAnnotationsById(filteredAnnotations.map(a => a.id)); - - this.annotationManager.jumpToAnnotation(annotationsFromViewer[0]); - this.annotationManager.selectAnnotations(annotationsFromViewer); } deleteAnnotations(annotationsIds?: readonly string[]) { @@ -221,6 +214,27 @@ export class PdfViewer { this.annotationManager.deselectAnnotations(ann); } + #selectAnnotations(annotations?: AnnotationWrapper[]) { + if (!annotations) { + return; + } + + const filteredAnnotations = annotations.filter(a => !!a); + + if (!filteredAnnotations.length) { + return; + } + + if (!this._multiSelectService.isActive) { + this.deselectAllAnnotations(); + } + + const annotationsFromViewer = this.getAnnotationsById(filteredAnnotations.map(a => a.id)); + + this.annotationManager.jumpToAnnotation(annotationsFromViewer[0]); + this.annotationManager.selectAnnotations(annotationsFromViewer); + } + private _navigateToPage(pageNumber: number) { if (this._currentInternalPage !== pageNumber) { this.documentViewer.displayPageLocation(pageNumber, 0, 0); diff --git a/libs/common-ui b/libs/common-ui index 3c0d4368c..5adbd5342 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 3c0d4368c70975255478d5ee038587c1ea97ecf8 +Subproject commit 5adbd5342fe94e2d1292054e7f0a8c6185b9420e From 3f45dcdfa11a30872e8887f43eb5b7bd500ffa2b Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 11 Apr 2022 12:29:21 +0000 Subject: [PATCH 02/10] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a865cf63d..14c977d6b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.419.0", + "version": "3.420.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a02b2dd3067160e5f0b5c643d8fafd440a1e04b4..3981a384fd3fc656f32e47f37c1c1b76227adc50 100644 GIT binary patch literal 3214 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 Ap#T5? From a7466ecd7f3ad2a657f3fc6e4b24a6dd64f3599f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 11 Apr 2022 15:29:46 +0300 Subject: [PATCH 03/10] RED-3800: Fixed scroll to annotation --- .../components/file-workload/file-workload.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts index ecc13ef02..04aa855e9 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts @@ -234,7 +234,7 @@ export class FileWorkloadComponent { return; } const elements: HTMLElement[] = this._annotationsElement.nativeElement.querySelectorAll( - `div[annotation-id="${this._firstSelectedAnnotation?.id}"].active`, + `[annotation-id="${this._firstSelectedAnnotation?.id}"].active`, ); FileWorkloadComponent._scrollToFirstElement(elements); } From c86af4e491974a1815d7f3eb76431b814ce768d6 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 11 Apr 2022 12:33:58 +0000 Subject: [PATCH 04/10] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 14c977d6b..8546ab9ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.420.0", + "version": "3.421.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 3981a384fd3fc656f32e47f37c1c1b76227adc50..d695f53fed8c2b4764524b96a92abd75622abe31 100644 GIT binary patch delta 3127 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

H0Z!QjR4Np!c?P9nU zpF14w2QV2w4OZOcY+cG=gjjmtsZuPhfKT@==}C`Ph92 zw4FOr@&hQy_+H~e0mEufAAEZTslW^^0)F)1_}8PwKy#%ge1ju38@GDg%OBR!Xn#PS z2r)UgfuRV%u|cfFS%Yv3E28EszUM{Fym>w*s<3IR2 zg}uaxV0?g_$<*xt<~|4>!vB&t2rBL)o*t;vCtn=sla706Fn~GoeZhd77e6Z);(JL3 zt!uY?L@?lU@7sY>1lbqpCke9m$A4v2L?j056D8WbW~4mu>UJW8DyA0l3-WM%IB568%^jV--oj3ltoM%qS2bcVubaW z_rER^@zK09_uQLG=G(X0Yjnw9Ya{+z`*MbA_^@hHQQ>!g;$u<4Uh2${_$|+J%kR7Vt}E!fg05@PcP(UB*?m@I?6Qs%T}%6shp`h=PdkI1MDoE$uOsOX zL*I$d-Ji$G8)EF9*&f6gXc!gU4>5YjV)Q)~qhdNQ4EWDu%Nr$qrxgtn<2ZNR7kmVW zIf8YAN0+~o2$CXdrY^mI>M;Mc<=oEg+|KRX&h6aJ?cC1o+|KRX&h6aJ?cC1o+|KRX R&g~c5{tw%#v2_4Y001qg5`+K% delta 3127 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 Date: Mon, 11 Apr 2022 15:50:30 +0300 Subject: [PATCH 05/10] RED-3800: Fixed scroll to annotation --- .../components/annotations-list/annotations-list.component.ts | 2 +- .../components/file-workload/file-workload.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts index 50a23def5..edd66edb7 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.ts @@ -98,7 +98,7 @@ export class AnnotationsListComponent extends HasScrollbarDirective implements O } else if (first.y < second.y) { return 1; } else { - return first.x < second.y ? -1 : 1; + return first.x < second.x ? -1 : 1; } } diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts index 04aa855e9..de7a3d0ac 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts @@ -234,7 +234,7 @@ export class FileWorkloadComponent { return; } const elements: HTMLElement[] = this._annotationsElement.nativeElement.querySelectorAll( - `[annotation-id="${this._firstSelectedAnnotation?.id}"].active`, + `[annotation-id="${this._firstSelectedAnnotation?.id}"]`, ); FileWorkloadComponent._scrollToFirstElement(elements); } From a42c2364bc30e61cb2ceddb4936610759dde83e1 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 11 Apr 2022 12:54:37 +0000 Subject: [PATCH 06/10] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8546ab9ae..cf0039d5f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.421.0", + "version": "3.422.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index d695f53fed8c2b4764524b96a92abd75622abe31..2b41f683f6101f40009c5a27b22e633549ccde90 100644 GIT binary patch delta 1015 zcmVA;Y{&MO{woyxAk++6Q!`v4^kXdbb8K^6|MEx8o-$H@ zU)FHC{yleTpY{J^w7vSTNQ@&U$L3L8f7lva!3%#%|DNM`Uax;|;eq}af#%G zx&6ZR|0YUtRTG9T|N8Y8*6Q-^;tk!FMa584WmlIeV`aU*xqnHDoYnJ9QEW1TOIpvP zVtWGy;r=ecTbez6^5>G|zx@j5^_nuA%^o%>dt=W$+rG1BzW5u6zYFnqDgLhDuOsF- zVvZx`IAV??<~V%LZ(>@P8Gibte!%7B_1(ps(}y!FB{(J(`qu?Q?<|_fW!=mDH zL{9mL>LQ~t`Y86|AjZ2vtHLpDYT&%3%OK|@Nlv6?y#_;wNLpl_;)@bTls&DHJzt)P zZ1%F1ht{Img(K}kvjJyyjAF;aFL4~xd;WsR>AfzaYb@=XXHO>s+xC|1qV1_O#?KMn+@ zi#J;mQ;do{dqQd;AUYw5>!PSMdFS??7!gXy8?G|#1dbdFExrx)O+qA~B_pB5uq z=w*Zx)@&hGAt$N$fBlRN1`^x>>x0#_@FB-EO({~**z7kNUqHHfqc0^c@yYGo*zamQ zPJemSX-ygkTPL)tnH8l}IvXK|Rz9%q4VX}l+(~eh`a26|lx1W#F%jHaBzjm8wKIpY z)Lk7JOTC32>g*H9L-+&&vC+|=uvY87PFYcLcw-04$Ro325)~D0T{`HVR9rUGR5jUn zcl3t1M{*g};QXD>HqRazlDer~dyffn;9?A$V8am3`(^gctINBKH*{MT6+=yxU0tS(mG%1OCVwe%R?jy@vB?N7X+4jM z?F|@&`?~~hY4-HVpG%Ve_A8v%Yszpod)TDxjXm>h`_7*E;%^}SF2vuZ_`8C?j+o~8&>e&Wl>W`3+Smxh8cZJ4&$D;pMO?DNfwKh3vC70KD1k^iWvYTi{AG-sqT*n-WiLHuVQ$HF=--b#5J3@DEMI1rdF z-fT%sF)H%x3Dr?WNRDtGqbp^LEct%B7P!p&TGOEKwsJ7$AskIx&->tCBi!Q9b>-`3 zW&oTkKP(zelA`LVLnpbdr61clMMrmJy;sx>riY%>JeT&-IX$ z<$qD9HEAGhozSXgR+LidY=jtE`M|n2U_v=^C&5wb?<|;6mXX=SL~v`7=wU_F&K$;4 zcXebe^%i=lvrixo;S&hNMn`|bTCMv!Wkto|jU6l_kIafmR8+Wi>7aX3aoJ2$)nwz{ z(Hr6($z@c7^LIYmJbPqF>ZW$>JtoM3Ghu9k9cM%nlIWQ7lw%J?%Nsyu|Xd@ z^dF*+)JJ?zP1yvx=THTed8 kd~-1eWEMz(WR_#}q?i9lp!~nHQ3N&!2-~W$bpTKR088`t{r~^~ From ffac0fb42019f4d3f18073caeb37c1575c6243ed Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 11 Apr 2022 17:15:11 +0300 Subject: [PATCH 07/10] RED-3747: check pages not out of bounds, fix rectangle deletion time --- .../components/pdf-viewer/pdf-viewer.component.ts | 2 -- .../manual-annotation-dialog.component.html | 9 +++++++-- .../manual-annotation-dialog.component.ts | 12 ++++++++---- .../file-preview/file-preview-screen.component.ts | 13 +++++++++---- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts index 4e389bd61..d1abb67d5 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.ts @@ -415,13 +415,11 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha const quads = [this._annotationDrawService.annotationToQuads(activeAnnotation)]; const manualRedactionEntry = this._getManualRedaction({ [activePage]: quads }); this._cleanUpSelectionAndButtonState(); - this.pdfViewer.deleteAnnotations([activeAnnotation.Id]); this.manualAnnotationRequested.emit({ manualRedactionEntry, type: 'REDACTION' }); } private _cleanUpSelectionAndButtonState() { - this.pdfViewer.deselectAllAnnotations(); this._headerConfigService.disable([HeaderElements.SHAPE_TOOL_GROUP_BUTTON]); this._headerConfigService.enable([HeaderElements.SHAPE_TOOL_GROUP_BUTTON]); } diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html index bb0fbcd81..6102f2b82 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html @@ -88,11 +88,16 @@

- + {{ 'manual-annotation.dialog.content.apply-on-multiple-pages' | translate }} -
+
, - @Inject(MAT_DIALOG_DATA) readonly data: { manualRedactionEntryWrapper: ManualRedactionEntryWrapper; dossierId: string }, + @Inject(MAT_DIALOG_DATA) readonly data: { manualRedactionEntryWrapper: ManualRedactionEntryWrapper; dossierId: string; file: File }, ) { super(_injector, _dialogRef); this._dossier = this._activeDossiersService.find(this.data.dossierId); @@ -70,7 +71,7 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme } get disabled() { - return this.form.invalid; + return this.form.invalid || (this.applyOnMultiplePages && !this.form.get('multiplePages')?.value); } async ngOnInit() { @@ -116,11 +117,14 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme const splitted = range.split('-'); const startPage = parseInt(splitted[0], 10); const endPage = splitted.length > 1 ? parseInt(splitted[1], 10) : startPage; - if (!startPage || !endPage) { + if (!startPage || !endPage || startPage > this.data.file.numberOfPages || endPage > this.data.file.numberOfPages) { throw new Error(); } for (let page = startPage; page <= endPage; page++) { + if (page === wrapper.manualRedactionEntry.positions[0].page) { + continue; + } const manualRedactionEntry = { ...entry, positions: [{ ...quads, page }] }; wrappers.push({ ...wrapper, manualRedactionEntry }); } diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 80def0dde..48e6f2bf0 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -250,13 +250,18 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni } openManualAnnotationDialog(manualRedactionEntryWrapper: ManualRedactionEntryWrapper) { - this._ngZone.run(() => { + return this._ngZone.run(async () => { + const file = await this.state.file; + this.dialogRef = this._dialogService.openDialog( 'manualAnnotation', null, - { manualRedactionEntryWrapper, dossierId: this.dossierId }, - async (wrappers: ManualRedactionEntryWrapper[]) => { - const file = await this.state.file; + { manualRedactionEntryWrapper, dossierId: this.dossierId, file }, + (wrappers: ManualRedactionEntryWrapper[]) => { + const selectedAnnotations = this.pdf.annotationManager.getSelectedAnnotations(); + if (selectedAnnotations.length > 0) { + this.pdf.deleteAnnotations([selectedAnnotations[0].Id]); + } const add$ = this._manualRedactionService.addAnnotation( wrappers.map(w => w.manualRedactionEntry).filter(e => e.positions[0].page <= file.numberOfPages), this.dossierId, From bf33545c45858b3f3c099c556ceb83872a6dde8e Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 11 Apr 2022 14:19:17 +0000 Subject: [PATCH 08/10] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cf0039d5f..6d4c8fb9c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.422.0", + "version": "3.423.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 2b41f683f6101f40009c5a27b22e633549ccde90..1f81f7fbbcd7954572137ffa6da006b884e54255 100644 GIT binary patch delta 3127 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

H0Z!QjR4Np!c?P9nU zpF14w2QV2w4OZOcY+cG=gjjmtsZuPhfKT@==}C`Ph92 zw4FOr@&hQy_+H~e0mEufAAEZTslW^^0)F)1_}8PwKy#%ge1ju38@GDg%OBR!Xn#PS z2r)UgfuRV%u|cfFS%Yv3E28EszUM{Fym>w*s<3IR2 zg}uaxV0?g_$<*xt<~|4>!vB&t2rBL)o*t;vCtn=sla706Fn~GoeZhd77e6Z);(JL3 zt!uY?L@?lU@7sY>1lbqpCke9m$A4v2L?j056D8WbW~4mu>UJW8DyA0l3-WM%IB568%^jV--oj3ltoM%qS2bcVubaW z_rER^@zK09_uQLG=G(X0Yjnw9Ya{+z`*MbA_^@hHQQ>!g;$u<4Uh2${_$|+J%kR7Vt}E!fg05@PcP(UB*?m@I?6Qs%T}%6shp`h=PdkI1MDoE$uOsOX zL*I$d-Ji$G8)EF9*&f6gXc!gU4>5YjV)Q)~qhdNQ4EWDu%Nr$qrxgtn<2ZNR7kmVW zIf8YAN0+~o2$CXdrY^mI>M;Mc<=oEg+|KRX&h6aJ?cC1o+|KRX&h6aJ?cC1o+|KRX R&g~c5{tvJ2OW^=e0046+6 Date: Mon, 11 Apr 2022 19:44:57 +0300 Subject: [PATCH 09/10] RED-3800: Remove some variables.$color usage --- .../notifications.component.scss | 10 ++--- .../spotlight-search.component.scss | 8 ++-- .../base-account-screen-component.scss | 3 +- .../notifications-screen.component.scss | 11 +++--- ...delete-dossier-state-dialog.component.scss | 6 +-- .../active-fields-listing.component.scss | 6 +-- ...ssier-states-listing-screen.component.scss | 4 +- .../general-config-screen.component.scss | 3 +- ...ossier-template-info-screen.component.scss | 1 - .../license-information-screen.component.scss | 5 +-- .../reports-screen.component.scss | 11 +++--- .../watermark-screen.component.scss | 10 ++--- .../dossier-details-stats.component.scss | 3 +- .../dossier-details.component.scss | 2 +- .../table-item/table-item.component.scss | 3 +- .../view-mode-selection.component.scss | 4 +- .../dossier-overview-screen.component.scss | 4 +- .../edit-dossier-attributes.component.scss | 6 +-- .../edit-dossier-dialog.component.scss | 3 +- .../edit-dossier-team.component.scss | 3 +- .../file-actions/file-actions.component.scss | 3 +- .../annotation-actions.component.scss | 4 +- .../annotation-card.component.scss | 4 +- .../annotation-details.component.scss | 10 ++--- .../annotation-references-list.component.scss | 2 - .../annotations-list.component.scss | 1 - .../document-info.component.scss | 3 +- .../file-workload.component.scss | 11 +++--- .../page-exclusion.component.scss | 9 ++--- .../page-indicator.component.scss | 12 +++--- .../pdf-viewer/pdf-viewer.component.scss | 14 +++---- .../view-switch/view-switch.component.scss | 6 +-- .../remove-annotations-dialog.component.scss | 4 +- .../file-preview-screen.component.scss | 6 +-- .../annotation-icon.component.scss | 8 ++-- .../user-button/user-button.component.scss | 2 +- .../dictionary-manager.component.scss | 8 ++-- .../dossier-state.component.scss | 4 +- .../initials-avatar.component.scss | 4 +- .../pagination/pagination.component.scss | 4 +- .../components/select/select.component.scss | 18 ++++----- .../simple-doughnut-chart.component.scss | 2 +- .../team-members/team-members.component.scss | 8 ++-- .../upload-status-overlay.component.scss | 20 +++++----- .../src/assets/styles/red-components.scss | 38 +++++++++---------- apps/red-ui/src/assets/styles/red-editor.scss | 2 +- libs/common-ui | 2 +- 47 files changed, 130 insertions(+), 185 deletions(-) diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.scss b/apps/red-ui/src/app/components/notifications/notifications.component.scss index 10f488a96..b0c2303ea 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.scss +++ b/apps/red-ui/src/app/components/notifications/notifications.component.scss @@ -41,24 +41,24 @@ white-space: normal; a { - color: variables.$accent; + color: var(--iqser-accent); font-weight: bold; } } } .dot { - background-color: variables.$grey-4; + background-color: var(--iqser-grey-4); top: 8px; right: 8px; cursor: pointer; } &:hover { - background-color: variables.$grey-6; + background-color: var(--iqser-grey-6); .dot { - background-color: variables.$grey-5; + background-color: var(--iqser-grey-5); } a { @@ -70,7 +70,7 @@ background-color: rgba(variables.$primary, 0.1); .dot { - background-color: variables.$primary; + background-color: var(--iqser-primary); } } } diff --git a/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.scss b/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.scss index 98c76a703..d725c9d04 100644 --- a/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.scss +++ b/apps/red-ui/src/app/components/spotlight-search/spotlight-search.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .spotlight-row { width: 300px; display: flex; @@ -9,13 +7,13 @@ font-size: 13px; border: none; outline: none; - color: variables.$accent; - background-color: variables.$white; + color: var(--iqser-accent); + background-color: var(--iqser-white); } .highlight { border-radius: 4px; - background-color: variables.$grey-2; + background-color: var(--iqser-grey-2); } .wrapper { diff --git a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.scss b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.scss index 787f8c31e..b8778a2b1 100644 --- a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.scss +++ b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.scss @@ -1,8 +1,7 @@ -@use 'variables'; @use 'common-mixins'; .content-container { - background-color: variables.$grey-2; + background-color: var(--iqser-grey-2); justify-content: center; @include common-mixins.scroll-bar; overflow: auto; diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.scss b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.scss index 4e0c1ce0b..5bfd95db4 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.scss +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.scss @@ -1,4 +1,3 @@ -@use 'variables'; @use 'common-mixins'; .dialog-content { @@ -8,8 +7,8 @@ grid-column: span 2; padding: 10px 10px; margin-bottom: -1px; - border-top: 1px solid variables.$separator; - border-bottom: 1px solid variables.$separator; + border-top: 1px solid var(--iqser-separator); + border-bottom: 1px solid var(--iqser-separator); } .options-content { @@ -17,7 +16,7 @@ .statement { opacity: 0.7; - color: variables.$grey-1; + color: var(--iqser-grey-1); font-weight: 500; padding: 10px 0; } @@ -25,10 +24,12 @@ .radio-container { display: flex; padding: 10px 0 10px; + .radio-button { display: flex; align-items: center; padding-right: 30px; + iqser-round-checkbox { margin-right: 8px; } @@ -39,7 +40,7 @@ padding: 10px 0; .group-title { - color: variables.$grey-1; + color: var(--iqser-grey-1); font-weight: 600; } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss index 616e7b39c..4128c859f 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss @@ -1,14 +1,12 @@ -@use 'variables'; - .replacement-suggestion { font-size: 13px; line-height: 18px; - color: variables.$grey-1; + color: var(--iqser-grey-1); margin-bottom: 24px; } .dialog-header { - color: variables.$primary; + color: var(--iqser-primary); } .heading { diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss index 053574610..ac98fbfef 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - :host ::ng-deep iqser-table { iqser-table-header { iqser-table-column-name .name { @@ -8,7 +6,7 @@ .header-item { box-shadow: none; - border-top: 1px solid variables.$separator; + border-top: 1px solid var(--iqser-separator); .all-caps-label { margin-right: 10px; @@ -20,7 +18,7 @@ .separator { margin-left: 14px; - background-color: variables.$separator; + background-color: var(--iqser-separator); width: 1px; height: 30px; margin-right: 16px; diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss index 1492972d9..1c40bf617 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .dossier-state-square { height: 16px; width: 16px; @@ -11,7 +9,7 @@ font-size: 16px; font-weight: 600; line-height: 20px; - color: variables.$grey-1; + color: var(--iqser-grey-1); } .right-container { diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.scss index 98e4dc474..fc571e7bc 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.scss @@ -1,8 +1,7 @@ -@use 'variables'; @use 'common-mixins'; .content-container { - background-color: variables.$grey-2; + background-color: var(--iqser-grey-2); display: flex; flex-direction: column; align-items: center; diff --git a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss index ec2f71ce4..907042503 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/info/info-screen/dossier-template-info-screen.component.scss @@ -1,4 +1,3 @@ -@use 'variables'; @use 'common-mixins'; :host { diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.scss index 4fb9dc336..04fde6620 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.scss @@ -1,5 +1,4 @@ @use 'common-mixins'; -@use 'variables'; .content-container { overflow: auto; @@ -28,7 +27,7 @@ &:hover { > div { - background-color: variables.$grey-2; + background-color: var(--iqser-grey-2); } } } @@ -37,7 +36,7 @@ grid-column: span 2; padding: 20px 20px 8px; margin-bottom: 8px; - border-bottom: 1px solid variables.$separator; + border-bottom: 1px solid var(--iqser-separator); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss index 09dc44a65..e2b5ad16b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss @@ -1,4 +1,3 @@ -@use 'variables'; @use 'common-mixins'; :host { @@ -27,7 +26,7 @@ .template { padding: 8px 10px; - background-color: variables.$grey-6; + background-color: var(--iqser-grey-6); border-radius: 4px; transition: background-color 0.2s; position: relative; @@ -54,7 +53,7 @@ } &:hover { - background-color: variables.$grey-4; + background-color: var(--iqser-grey-4); .actions { display: flex; @@ -86,8 +85,8 @@ grid-template-columns: 1fr 2fr; .all-caps-label { - border-top: 1px solid variables.$separator; - border-bottom: 1px solid variables.$separator; + border-top: 1px solid var(--iqser-separator); + border-bottom: 1px solid var(--iqser-separator); padding: 8px 32px; &:nth-child(2) { @@ -98,7 +97,7 @@ .placeholder, .description { padding: 16px 16px; - border-bottom: 1px solid variables.$separator; + border-bottom: 1px solid var(--iqser-separator); } .placeholder { diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.scss index 7b0777c44..74143cc02 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.scss @@ -21,7 +21,7 @@ min-width: 353px; padding: 24px; border-left: none; - border-right: 1px solid variables.$separator; + border-right: 1px solid var(--iqser-separator); &.has-scrollbar:hover { padding-right: 13px; @@ -38,8 +38,8 @@ width: 60px; height: 60px; border-radius: 8px; - background-color: variables.$grey-6; - color: variables.$grey-7; + background-color: var(--iqser-grey-6); + color: var(--iqser-grey-7); align-items: center; justify-content: center; text-align: center; @@ -60,8 +60,8 @@ } &.active { - background-color: variables.$primary; - color: variables.$white; + background-color: var(--iqser-primary); + color: var(--iqser-white); } &.times-new-roman { diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss index 7f225ce33..aa6d3e1a6 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.scss @@ -1,4 +1,3 @@ -@use 'variables'; @use 'common-components'; @use 'common-texts'; @@ -22,7 +21,7 @@ transition: background-color 0.2s; &:hover { - background-color: variables.$grey-6; + background-color: var(--iqser-grey-6); } } } diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.scss index a70828056..73039cfb8 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.scss +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.scss @@ -29,7 +29,7 @@ padding: 3px 8px; &:hover { - background-color: variables.$grey-6; + background-color: var(--iqser-grey-6); } &.active { diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss index d89397c3e..396e6bfb4 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss @@ -1,8 +1,7 @@ @use 'common-mixins'; -@use 'variables'; .error { - color: variables.$primary; + color: var(--iqser-primary); } .extend-cols { diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.scss index 7e96bbb4e..83c4b6a5f 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.scss +++ b/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.scss @@ -1,7 +1,5 @@ -@use 'variables'; - .view-mode-selection { - border-right: 1px solid variables.$separator; + border-right: 1px solid var(--iqser-separator); padding-right: 16px; margin-right: 16px !important; display: flex; diff --git a/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.scss b/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.scss index e27270951..d6417fe17 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.scss +++ b/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.scss @@ -1,5 +1,5 @@ -@use 'variables'; @use 'common-mixins'; +@use 'variables'; .file-upload-input { display: none; @@ -9,7 +9,7 @@ &.last-opened { .selection-column { padding-left: 6px !important; - border-left: 4px solid variables.$primary; + border-left: 4px solid var(--iqser-primary); } .selection-column, diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.scss index 1354748b7..bb8b9318c 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - :host { display: flex; min-height: 100%; @@ -18,7 +16,7 @@ height: 100%; width: 1px; padding: 0; - background-color: variables.$separator; + background-color: var(--iqser-separator); } .datepicker-wrapper { @@ -60,7 +58,7 @@ height: 50px; object-fit: cover; object-position: center; - border: 1px solid variables.$grey-5; + border: 1px solid var(--iqser-grey-5); margin-right: 15px; } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.scss index 73e9c5654..47f54c0b8 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.scss @@ -1,10 +1,9 @@ -@use 'variables'; @use 'common-mixins'; .dialog-content { padding: 0; margin-top: 24px; - border-top: 1px solid variables.$separator; + border-top: 1px solid var(--iqser-separator); overflow: hidden; flex-direction: row; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss index ba22b9f9f..0d427a120 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss @@ -1,5 +1,4 @@ @use 'common-mixins'; -@use 'variables'; .search-container { margin-top: 16px; @@ -55,7 +54,7 @@ redaction-team-members { &.selected, &:hover { - background-color: variables.$grey-2; + background-color: var(--iqser-grey-2); .actions { display: flex; diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.scss b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.scss index 759479c3d..845f42238 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.scss +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.scss @@ -1,9 +1,8 @@ @use 'common-mixins'; -@use 'variables'; .file-actions { display: flex; - color: variables.$grey-1; + color: var(--iqser-grey-1); > *:not(:last-child) { margin-right: 2px; diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.scss index 79ed0f815..f77411ebb 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .annotation-actions { display: none; @@ -8,7 +6,7 @@ } .confirm.active { - background-color: variables.$grey-2; + background-color: var(--iqser-grey-2); } > *:not(:last-child) { diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.scss index 5e8de6b86..bda37fef8 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .details { display: flex; position: relative; @@ -17,5 +15,5 @@ redaction-type-annotation-icon { } .pending-analysis { - color: variables.$red-1; + color: var(--iqser-red-1); } diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.scss index 39f778b05..a3b6a8184 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-details/annotation-details.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - :host { display: flex; position: absolute; @@ -11,11 +9,11 @@ width: 260px; padding: 10px; border-radius: 3px; - background-color: variables.$grey-1; - color: variables.$white; + background-color: var(--iqser-grey-1); + color: var(--iqser-white); mat-icon { - color: variables.$white; + color: var(--iqser-white); flex-shrink: 0; } @@ -30,7 +28,7 @@ height: 24px; &:hover { - background-color: variables.$grey-6; + background-color: var(--iqser-grey-6); border-radius: 12px; mat-icon { diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-references-list/annotation-references-list.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotation-references-list/annotation-references-list.component.scss index 02888fb62..1d0165d1f 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-references-list/annotation-references-list.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-references-list/annotation-references-list.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .uppercase { text-transform: uppercase; } diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.scss b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.scss index 863712648..5f41248b8 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/annotations-list/annotations-list.component.scss @@ -1,4 +1,3 @@ -@use 'variables'; @use 'common-mixins'; :host { diff --git a/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.scss b/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.scss index 4ff5ff6c0..38a5345f4 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/document-info/document-info.component.scss @@ -1,4 +1,3 @@ -@use 'variables'; @use 'common-mixins'; :host { @@ -42,7 +41,7 @@ } &:not(:last-child) { - border-bottom: 1px solid variables.$separator; + border-bottom: 1px solid var(--iqser-separator); } } diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss index f6b409b33..c7ddef779 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss @@ -1,4 +1,3 @@ -@use 'variables'; @use 'common-mixins'; :host { @@ -7,7 +6,7 @@ .banner { padding: 13px 16px; - color: variables.$white; + color: var(--iqser-white); justify-content: space-between; .read-only-text, @@ -40,11 +39,11 @@ } .read-only { - background-color: variables.$primary; + background-color: var(--iqser-primary); } .disabled-auto-analysis { - background-color: variables.$yellow-2; + background-color: var(--iqser-yellow-2); } .right-content { @@ -84,7 +83,7 @@ } .quick-navigation { - border-right: 1px solid variables.$separator; + border-right: 1px solid var(--iqser-separator); min-width: 61px; overflow: hidden; display: flex; @@ -99,7 +98,7 @@ transition: background-color 0.25s; &:not(.disabled):hover { - background-color: variables.$grey-6; + background-color: var(--iqser-grey-6); } mat-icon { diff --git a/apps/red-ui/src/app/modules/file-preview/components/page-exclusion/page-exclusion.component.scss b/apps/red-ui/src/app/modules/file-preview/components/page-exclusion/page-exclusion.component.scss index 7d6774afd..03b21d706 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/page-exclusion/page-exclusion.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/page-exclusion/page-exclusion.component.scss @@ -1,4 +1,3 @@ -@use 'variables'; @use 'common-mixins'; :host { @@ -7,13 +6,13 @@ flex-direction: column; .exclude-pages-input-container { - background-color: variables.$grey-6; + background-color: var(--iqser-grey-6); padding: 15px 15px 16px 14px; } .all-caps-label-container { padding: 8px 16px; - border-bottom: 1px solid variables.$separator; + border-bottom: 1px solid var(--iqser-separator); } .ranges { @@ -22,7 +21,7 @@ .range { padding-left: 17px; padding-right: 16px; - border-bottom: 1px solid variables.$separator; + border-bottom: 1px solid var(--iqser-separator); transition: background-color 0.2s; display: flex; align-items: center; @@ -34,7 +33,7 @@ } &:hover { - background-color: variables.$grey-8; + background-color: var(--iqser-grey-8); iqser-circle-button { display: initial; diff --git a/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.scss b/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.scss index a6cc77d4e..818da8a29 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/page-indicator/page-indicator.component.scss @@ -1,18 +1,16 @@ -@use 'variables'; - .page-wrapper { - color: variables.$accent; + color: var(--iqser-accent); position: relative; padding: 12px 14px 12px 8px; cursor: pointer; border-left: 4px solid transparent; &:hover { - background-color: variables.$grey-2; + background-color: var(--iqser-grey-2); } &.active { - border-left: 4px solid variables.$primary; + border-left: 4px solid var(--iqser-primary); } mat-icon { @@ -35,10 +33,10 @@ } &.read { - color: variables.$grey-5; + color: var(--iqser-grey-5); .text { - color: variables.$accent; + color: var(--iqser-accent); } } diff --git a/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.scss b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.scss index 40e50e4c7..faea956be 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/pdf-viewer/pdf-viewer.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .page { display: flex; flex-direction: column; @@ -28,9 +26,9 @@ bottom: 20px; left: 50%; transform: translate(-50%); - background: variables.$white; - color: variables.$grey-7; - border: 1px solid variables.$grey-7; + background: var(--iqser-white); + color: var(--iqser-grey-7); + border: 1px solid var(--iqser-grey-7); border-radius: 8px; padding: 6px 2px; display: flex; @@ -56,7 +54,7 @@ margin: 0; } - color: variables.$grey-7; + color: var(--iqser-grey-7); text-decoration: none; outline: none; border: none; @@ -67,7 +65,7 @@ &:hover, &:focus { font-weight: bold; - border-bottom: 1px solid variables.$grey-7; + border-bottom: 1px solid var(--iqser-grey-7); } } @@ -79,7 +77,7 @@ padding-right: 4px; &:hover { - color: variables.$accent; + color: var(--iqser-accent); } } } diff --git a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.scss b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.scss index 502187c53..ede860ad2 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.scss @@ -1,11 +1,9 @@ -@use 'variables'; - :host { display: contents; } .disabled { - background-color: variables.$grey-6; - color: variables.$grey-3; + background-color: var(--iqser-grey-6); + color: var(--iqser-grey-3); cursor: default; } diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss index f54f398c1..676104d29 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .content-wrapper { padding-top: 20px; padding-bottom: 8px; @@ -18,6 +16,6 @@ ul { td { padding: 8px; text-align: left; - border: 1px solid variables.$separator; + border: 1px solid var(--iqser-separator); } } diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss index 83d8a5aca..f149bcbab 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.scss @@ -1,9 +1,7 @@ -@use 'variables'; - .vertical-line { width: 1px; height: 30px; - background-color: variables.$grey-4; + background-color: var(--iqser-grey-4); margin: 0 16px; } @@ -29,7 +27,7 @@ ::ng-deep .right-title { min-height: 70px; display: flex; - border-bottom: 1px solid variables.$separator; + border-bottom: 1px solid var(--iqser-separator); align-items: center; justify-content: space-between; padding: 0 24px; diff --git a/apps/red-ui/src/app/modules/shared/components/annotation-icon/annotation-icon.component.scss b/apps/red-ui/src/app/modules/shared/components/annotation-icon/annotation-icon.component.scss index 056c8a268..34ce718fd 100644 --- a/apps/red-ui/src/app/modules/shared/components/annotation-icon/annotation-icon.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/annotation-icon/annotation-icon.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .icon { height: 16px; width: 16px; @@ -11,7 +9,7 @@ align-items: center; text-align: center; text-transform: uppercase; - color: variables.$white; + color: var(--iqser-white); position: relative; background-color: var(--color); } @@ -60,9 +58,9 @@ } .skipped { - background-color: variables.$grey-5; + background-color: var(--iqser-grey-5); } .none { - color: variables.$accent; + color: var(--iqser-accent); } diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss index eb363230f..c9d2d061d 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss @@ -1,5 +1,5 @@ -@use 'variables'; @use 'common-buttons'; +@use 'variables'; :host { @extend .user-button; diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss index f9b6d62e8..59033e579 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - :host { width: 100%; height: 100%; @@ -68,7 +66,7 @@ form { position: absolute; right: 12px; top: 8px; - color: variables.$accent; + color: var(--iqser-accent); .with-input { display: flex; @@ -96,7 +94,7 @@ form { padding: 0 100px; box-sizing: border-box; text-align: center; - border: 1px solid variables.$grey-5; + border: 1px solid var(--iqser-grey-5); > mat-icon { height: 60px; @@ -106,6 +104,6 @@ form { } .heading-l { - color: variables.$grey-7; + color: var(--iqser-grey-7); } } diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-state/dossier-state.component.scss b/apps/red-ui/src/app/modules/shared/components/dossier-state/dossier-state.component.scss index c6f74191a..ce8a15efc 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossier-state/dossier-state.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/dossier-state/dossier-state.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .dossier-state-container { justify-content: flex-end; width: 100%; @@ -12,5 +10,5 @@ redaction-small-chip { .dossier-state-text { font-size: 13px; line-height: 16px; - color: variables.$grey-1; + color: var(--iqser-grey-1); } diff --git a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.scss b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.scss index cba801a89..dad8a5dee 100644 --- a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .wrapper { display: flex; align-items: center; @@ -15,5 +13,5 @@ } .border { - border: 1px solid variables.$grey-7; + border: 1px solid var(--iqser-grey-7); } diff --git a/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.scss b/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.scss index f8dc457ed..fae36a8b2 100644 --- a/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - :host { display: flex; @@ -22,7 +20,7 @@ } &.active { - color: variables.$primary; + color: var(--iqser-primary); font-weight: bold; } } diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.scss b/apps/red-ui/src/app/modules/shared/components/select/select.component.scss index cfd073e35..afcada18e 100644 --- a/apps/red-ui/src/app/modules/shared/components/select/select.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.scss @@ -1,9 +1,9 @@ -@use 'variables'; @use 'common-mixins'; +@use 'variables'; :host { border-radius: 8px; - border: 1px solid variables.$grey-5; + border: 1px solid var(--iqser-grey-5); min-height: 100%; display: block; @@ -65,23 +65,23 @@ mat-chip { } .mat-chip.mat-standard-chip.mat-chip-selected.mat-primary { - background-color: variables.$grey-6; - color: variables.$accent; + background-color: var(--iqser-grey-6); + color: var(--iqser-accent); } .mat-chip.mat-standard-chip { - background-color: variables.$white; - color: variables.$accent; + background-color: var(--iqser-white); + color: var(--iqser-accent); margin: 0 0 2px 0; transition: background-color 0.2s; &:hover { - background-color: variables.$grey-8; + background-color: var(--iqser-grey-8); } } .mat-chip.mat-standard-chip::after { - background: variables.$grey-8; + background: var(--iqser-grey-8); } .mat-standard-chip:focus::after { @@ -90,5 +90,5 @@ mat-chip { .disabled { pointer-events: none; - color: variables.$grey-5; + color: var(--iqser-grey-5); } diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss index 50f6f089a..2e474e4dd 100644 --- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss @@ -57,7 +57,7 @@ } &:hover:not(.active):not(.filter-disabled) { - background-color: variables.$grey-6; + background-color: var(--iqser-grey-6); } &.active { diff --git a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.scss b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.scss index c424beb86..03fc6cf21 100644 --- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.scss @@ -1,5 +1,3 @@ -@use 'variables'; - .container { flex-wrap: wrap; margin-top: 4px; @@ -27,8 +25,8 @@ width: 16px; height: 16px; border-radius: 50%; - background-color: variables.$accent; - color: variables.$white; + background-color: var(--iqser-accent); + color: var(--iqser-white); position: absolute; right: -8px; bottom: -2px; @@ -48,6 +46,6 @@ .see-less { opacity: 1; - color: variables.$primary; + color: var(--iqser-primary); margin-top: 16px; } diff --git a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.scss b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.scss index 58d734dae..c2569c204 100644 --- a/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.scss +++ b/apps/red-ui/src/app/modules/upload-download/upload-status-overlay/upload-status-overlay.component.scss @@ -1,8 +1,8 @@ -@use 'variables'; @use 'common-mixins'; +@use 'variables'; .red-upload-download-overlay { - background: variables.$white; + background: var(--iqser-white); position: fixed; bottom: 20px; right: 20px; @@ -19,14 +19,14 @@ padding: 16px 14px 16px 16px; cursor: pointer; - color: variables.$accent; + color: var(--iqser-accent); font-size: 13px; font-weight: 600; line-height: 16px; mat-icon { height: 13px; - color: variables.$accent; + color: var(--iqser-accent); &.collapse-icon { height: 15px; @@ -34,7 +34,7 @@ } &.expanded { - border-bottom: 1px solid variables.$separator; + border-bottom: 1px solid var(--iqser-separator); } } @@ -45,14 +45,14 @@ > div:not(:first-child) { .dossier-name-wrapper { - border-top: 1px solid variables.$separator; + border-top: 1px solid var(--iqser-separator); } } .dossier-name-wrapper { display: flex; padding: 4px 16px; - background-color: variables.$grey-2; + background-color: var(--iqser-grey-2); > span { @include common-mixins.line-clamp(1); @@ -63,7 +63,7 @@ padding: 10px 16px 12px 16px; font-size: 11px; line-height: 14px; - border-top: 1px solid variables.$separator; + border-top: 1px solid var(--iqser-separator); position: relative; .upload-download-line { @@ -95,7 +95,7 @@ .error-message { margin-top: 2px; - color: variables.$primary; + color: var(--iqser-primary); } } @@ -119,7 +119,7 @@ } &:not(.error):hover { - background-color: variables.$grey-2; + background-color: var(--iqser-grey-2); .actions { display: flex; diff --git a/apps/red-ui/src/assets/styles/red-components.scss b/apps/red-ui/src/assets/styles/red-components.scss index 06e080399..e9f484584 100644 --- a/apps/red-ui/src/assets/styles/red-components.scss +++ b/apps/red-ui/src/assets/styles/red-components.scss @@ -1,5 +1,5 @@ -@use 'variables'; @use 'common-mixins'; +@use 'variables'; .NEW { stroke: var(--iqser-grey-5); @@ -13,45 +13,45 @@ .UNDER_REVIEW, .REGULAR { - stroke: variables.$yellow-1; - background-color: variables.$yellow-1; + stroke: var(--iqser-yellow-1); + background-color: var(--iqser-yellow-1); } .UNDER_APPROVAL { - stroke: variables.$blue-4; - background-color: variables.$blue-4; + stroke: var(--iqser-blue-4); + background-color: var(--iqser-blue-4); } .APPROVED, .ADMIN { - stroke: variables.$blue-3; - background-color: variables.$blue-3; + stroke: var(--iqser-blue-3); + background-color: var(--iqser-blue-3); } .PROCESSING { - stroke: variables.$accent; - background-color: variables.$accent; + stroke: var(--iqser-accent); + background-color: var(--iqser-accent); } .OCR_PROCESSING, .USER_ADMIN { - stroke: variables.$green-2; - background-color: variables.$green-2; + stroke: var(--iqser-green-2); + background-color: var(--iqser-green-2); } .REPROCESS { - stroke: variables.$accent; - background-color: variables.$accent; + stroke: var(--iqser-accent); + background-color: var(--iqser-accent); } .FULLREPROCESS { - stroke: variables.$accent; - background-color: variables.$accent; + stroke: var(--iqser-accent); + background-color: var(--iqser-accent); } .EXCLUDED { - stroke: variables.$pink-1; - background-color: variables.$pink-1; + stroke: var(--iqser-pink-1); + background-color: var(--iqser-pink-1); } .ERROR { @@ -76,8 +76,8 @@ .MANAGER, .MANAGER_ADMIN { - stroke: variables.$primary; - background-color: variables.$primary; + stroke: var(--iqser-primary); + background-color: var(--iqser-primary); } .workload-separator { diff --git a/apps/red-ui/src/assets/styles/red-editor.scss b/apps/red-ui/src/assets/styles/red-editor.scss index 447ecdc50..4f1a692d1 100644 --- a/apps/red-ui/src/assets/styles/red-editor.scss +++ b/apps/red-ui/src/assets/styles/red-editor.scss @@ -60,7 +60,7 @@ right: 40px; border-radius: 8px; padding: 16px 32px 16px 16px; - background-color: variables.$white; + background-color: var(--iqser-white); box-shadow: 0 2px 6px 0 rgba(40, 50, 65, 0.3); z-index: 5000; diff --git a/libs/common-ui b/libs/common-ui index 5adbd5342..6a0e22e68 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 5adbd5342fe94e2d1292054e7f0a8c6185b9420e +Subproject commit 6a0e22e68441a1dbbaaa38cfebed1aa8e8bb91be From 1683cd8252f3854664c52854d7a58becf21b7cc8 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 11 Apr 2022 16:49:15 +0000 Subject: [PATCH 10/10] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3289 bytes paligo-theme/paligo-styles/redacto-theme.css | 10 ++++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d4c8fb9c..3db2817d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.423.0", + "version": "3.424.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 1f81f7fbbcd7954572137ffa6da006b884e54255..6cbf012adaec7ec36ca1899c9aa8f23db108cfe1 100644 GIT binary patch delta 3113 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 YldudNlfVoG3}0;fKO*&Ipa4(+0Ex2O*Z=?k diff --git a/paligo-theme/paligo-styles/redacto-theme.css b/paligo-theme/paligo-styles/redacto-theme.css index fc5511db6..76ac4602e 100644 --- a/paligo-theme/paligo-styles/redacto-theme.css +++ b/paligo-theme/paligo-styles/redacto-theme.css @@ -320,13 +320,23 @@ li.searchresultitem { --iqser-grey-6: #f0f1f4; --iqser-grey-7: #9398a0; --iqser-grey-8: #f9fafb; + --iqser-grey-9: #f5f5f7; + --iqser-grey-10: #313d4e; + --iqser-grey-11: #ecedf0; --iqser-green-1: #00ff00; --iqser-green-2: #5ce594; + --iqser-orange-1: #ff801a; --iqser-yellow-1: #ffb83b; --iqser-yellow-2: #fdbd00; --iqser-yellow-rgb: 253, 189, 0; --iqser-red-1: #dd4d50; + --iqser-red-2: #f16164; + --iqser-blue-1: #4875f7; + --iqser-blue-2: #48c9f7; + --iqser-blue-3: #5b97db; + --iqser-blue-4: #374c81; --iqser-blue-5: #c5d3eb; + --iqser-pink-1: #f125de; --iqser-helpmode-primary: green; }