diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html index eb02b8739..f70f7715d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.html @@ -56,26 +56,26 @@
@@ -83,14 +83,18 @@
-
+
- + + +
-
+
- + + +
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts index 829937035..cbf1c03af 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts @@ -84,15 +84,15 @@ export class WatermarkScreenComponent implements OnInit { readonly orientationOptions = ['DIAGONAL', 'HORIZONTAL', 'VERTICAL']; instance: WebViewerInstance; readonly loaded$: Observable; + readonly watermarkHorizontalAlignments = Object.values(WATERMARK_HORIZONTAL_ALIGNMENTS); + readonly watermarkVerticalAlignments = Object.values(WATERMARK_VERTICAL_ALIGNMENTS); + currentAlignment: WatermarkAlignment; @ViewChild('viewer', { static: true }) private readonly _viewer: ElementRef; private readonly _convertPath = inject(BASE_HREF_FN); readonly #loaded$ = new BehaviorSubject(false); readonly #dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID); readonly #watermarkId = Number(getParam(WATERMARK_ID)); #watermark: Partial = {}; - readonly watermarkHorizontalAlignments = Object.values(WATERMARK_HORIZONTAL_ALIGNMENTS); - readonly watermarkVerticalAlignments = Object.values(WATERMARK_VERTICAL_ALIGNMENTS); - currentAlignment: WatermarkAlignment; constructor( private readonly _http: HttpClient, diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts index 9df82e8c9..eb5a6fecf 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts @@ -23,7 +23,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { PaginatorComponent } from './paginator/paginator.component'; import { MatIconModule } from '@angular/material/icon'; import { ReactiveFormsModule } from '@angular/forms'; -import { MatLegacySliderModule } from '@angular/material/legacy-slider'; +import { MatSliderModule } from '@angular/material/slider'; import { ColorPickerModule } from 'ngx-color-picker'; import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; import { MatTooltipModule } from '@angular/material/tooltip'; @@ -67,7 +67,7 @@ const routes: IqserRoutes = [ MatIconModule, IconButtonComponent, ReactiveFormsModule, - MatLegacySliderModule, + MatSliderModule, ColorPickerModule, MatLegacySlideToggleModule, CircleButtonComponent, diff --git a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts index 73397a378..f96a5b336 100644 --- a/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts +++ b/apps/red-ui/src/app/modules/mat-config/mat-config.module.ts @@ -3,7 +3,6 @@ import { MatNativeDateModule } from '@angular/material/core'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; -import { MatLegacySliderModule as MatSliderModule } from '@angular/material/legacy-slider'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; @@ -24,7 +23,6 @@ const matImports = [ MatToolbarModule, MatButtonModule, MatSlideToggleModule, - MatSliderModule, MatMenuModule, MatTooltipModule, MatButtonToggleModule, diff --git a/libs/common-ui b/libs/common-ui index e884d8a51..2ec18cc91 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit e884d8a513c8dd2df3564b3021bfa0d46bfe74d1 +Subproject commit 2ec18cc91db5548d086e0fc59a3351f6d373d5a3