diff --git a/angular.json b/angular.json index 95d3aa1c3..aa7773254 100644 --- a/angular.json +++ b/angular.json @@ -50,9 +50,14 @@ "input": "apps/red-ui/src/assets/", "output": "/assets/" }, + { + "glob": "**/*", + "input": "libs/common-ui/src/assets/", + "output": "/assets/" + }, "apps/red-ui/src/manifest.webmanifest" ], - "styles": ["apps/red-ui/src/styles.scss"], + "styles": ["apps/red-ui/src/styles.scss", "libs/common-ui/src/assets/styles/common.scss"], "scripts": ["node_modules/@pdftron/webviewer/webviewer.min.js"], "vendorChunk": true, "extractLicenses": false, diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.scss b/apps/red-ui/src/app/components/base-screen/base-screen.component.scss index 12959da2c..b573da15f 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.scss +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.scss @@ -1,4 +1,4 @@ -@import '../../../assets/styles/red-variables'; +@import '../../../assets/styles/variables'; @import '../../../assets/styles/red-mixins'; .dev-mode { diff --git a/apps/red-ui/src/app/components/logo/logo.component.scss b/apps/red-ui/src/app/components/logo/logo.component.scss index dac4c56ba..2dc42ff64 100644 --- a/apps/red-ui/src/app/components/logo/logo.component.scss +++ b/apps/red-ui/src/app/components/logo/logo.component.scss @@ -1,4 +1,4 @@ -@import '../../../assets/styles/red-variables'; +@import '../../../assets/styles/variables'; :host { color: $primary; 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 95075e917..9b9bf34d1 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.scss +++ b/apps/red-ui/src/app/components/notifications/notifications.component.scss @@ -1,4 +1,4 @@ -@import '../../../assets/styles/red-variables'; +@import '../../../assets/styles/variables'; .mt-2 { margin-top: 2px; 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 5f7657fc6..349d5ce01 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,4 +1,4 @@ -@import 'apps/red-ui/src/assets/styles/red-variables'; +@import '../../../assets/styles/variables'; .spotlight-wrapper { overflow: hidden; @@ -19,7 +19,7 @@ font-weight: 500; border: none; outline: none; - color: $grey-1; + color: $accent; padding: 0 24px; background-color: $white; } diff --git a/apps/red-ui/src/app/components/toast/toast.component.scss b/apps/red-ui/src/app/components/toast/toast.component.scss index 93be7acbb..6b1684fa0 100644 --- a/apps/red-ui/src/app/components/toast/toast.component.scss +++ b/apps/red-ui/src/app/components/toast/toast.component.scss @@ -1 +1 @@ -@import '../../../assets/styles/red-variables'; +@import '../../../assets/styles/variables'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss index c5eefa9a6..ee380a74f 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .first-row { display: flex; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.html index a770d5ae2..730db8b41 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.html @@ -45,13 +45,13 @@ {{ (user ? 'add-edit-user.actions.save-changes' : 'add-edit-user.actions.save') | translate }} - + [type]="iconButtonTypes.show_bg" + >
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts index 3fe562f79..617d32a01 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts @@ -4,6 +4,7 @@ import { User, UserControllerService } from '@redaction/red-ui-http'; import { AdminDialogService } from '../../../services/admin-dialog.service'; import { LoadingService } from '@services/loading.service'; import { rolesTranslations } from '../../../../../translations/roles-translations'; +import { IconButtonTypes } from '@iqser/common-ui'; @Component({ selector: 'redaction-user-details', @@ -11,12 +12,14 @@ import { rolesTranslations } from '../../../../../translations/roles-translation styleUrls: ['./user-details.component.scss'] }) export class UserDetailsComponent implements OnInit { + readonly iconButtonTypes = IconButtonTypes; + @Input() user: User; @Output() toggleResetPassword = new EventEmitter(); @Output() closeDialog = new EventEmitter(); userForm: FormGroup; readonly ROLES = ['RED_USER', 'RED_MANAGER', 'RED_USER_ADMIN', 'RED_ADMIN']; - translations = rolesTranslations; + readonly translations = rolesTranslations; private readonly _ROLE_REQUIREMENTS = { RED_MANAGER: 'RED_USER', RED_ADMIN: 'RED_USER_ADMIN' }; constructor( diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component.scss index ddf782c9b..2e2ff968a 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .dialog-header { color: $primary; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.scss index ddf782c9b..2e2ff968a 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .dialog-header { color: $primary; 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 08c1ffaad..349ad4c2a 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,4 +1,4 @@ -@import '../../../../../../assets/styles/red-variables'; +@import '../../../../../../assets/styles/variables'; redaction-table-col-name::ng-deep { > div { diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss index fa5bc1e46..95e0b39a0 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .sub-header { diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html index 7cbbd7459..b5532b31f 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html @@ -46,13 +46,13 @@ type="search" >
- + [type]="iconButtonTypes.primary" + >
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.scss index e49e5d61f..950836853 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .header-item { diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts index d0cb34314..8847f47ca 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts @@ -15,6 +15,7 @@ import { ScreenStateService } from '@shared/services/screen-state.service'; import { SortingService } from '@services/sorting.service'; import { BaseListingComponent } from '@shared/base/base-listing.component'; import { AdminDialogService } from '../../services/admin-dialog.service'; +import { IconButtonTypes } from '@iqser/common-ui'; const toChartConfig = (dict: TypeValueWrapper): DoughnutChartConfig => ({ value: dict.entries?.length ?? 0, @@ -29,6 +30,8 @@ const toChartConfig = (dict: TypeValueWrapper): DoughnutChartConfig => ({ providers: [FilterService, SearchService, ScreenStateService, SortingService] }) export class DictionaryListingScreenComponent extends BaseListingComponent implements OnInit { + readonly iconButtonTypes = IconButtonTypes; + chartData: DoughnutChartConfig[] = []; protected readonly _primaryKey = 'label'; diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.scss index 70de05190..b35b035bc 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .right-container { diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html index fd0ba0385..1d9216985 100644 --- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html @@ -73,21 +73,21 @@
- + [type]="iconButtonTypes.primary" + > - + [type]="iconButtonTypes.primary" + >
- + [type]="iconButtonTypes.primary" + >
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts index 3feeccebc..d474a027c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts @@ -12,6 +12,7 @@ import { ScreenStateService } from '@shared/services/screen-state.service'; import { PermissionsService } from '@services/permissions.service'; import { DossierAttributesService } from '@shared/services/controller-wrappers/dossier-attributes.service'; import { dossierAttributeTypesTranslations } from '../../translations/dossier-attribute-types-translations'; +import { IconButtonTypes } from '@iqser/common-ui'; @Component({ templateUrl: './dossier-attributes-listing-screen.component.html', @@ -19,7 +20,8 @@ import { dossierAttributeTypesTranslations } from '../../translations/dossier-at providers: [FilterService, SearchService, ScreenStateService, SortingService] }) export class DossierAttributesListingScreenComponent extends BaseListingComponent implements OnInit { - translations = dossierAttributeTypesTranslations; + readonly iconButtonTypes = IconButtonTypes; + readonly translations = dossierAttributeTypesTranslations; protected readonly _primaryKey = 'label'; constructor( diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html index c2bf9a694..0b861bfa0 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html @@ -40,13 +40,13 @@ type="search" > - + [type]="iconButtonTypes.primary" + > diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss index e602d688d..6fd6360f8 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .header-item { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts index 588e394e8..af6855286 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts @@ -11,6 +11,7 @@ import { SearchService } from '@shared/services/search.service'; import { ScreenStateService } from '@shared/services/screen-state.service'; import { BaseListingComponent } from '@shared/base/base-listing.component'; import { SortingService } from '@services/sorting.service'; +import { IconButtonTypes } from '@iqser/common-ui'; @Component({ templateUrl: './dossier-templates-listing-screen.component.html', @@ -19,7 +20,8 @@ import { SortingService } from '@services/sorting.service'; providers: [FilterService, SearchService, ScreenStateService, SortingService] }) export class DossierTemplatesListingScreenComponent extends BaseListingComponent implements OnInit { - protected _primaryKey = 'name'; + readonly iconButtonTypes = IconButtonTypes; + protected readonly _primaryKey = 'name'; constructor( private readonly _dialogService: AdminDialogService, diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html index 8391272b9..98705018d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html @@ -58,13 +58,13 @@ type="dark-bg" > - + [type]="iconButtonTypes.primary" + > diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts index 32d0425ae..c99e66f0c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts @@ -11,6 +11,7 @@ import { ScreenStateService } from '@shared/services/screen-state.service'; import { SortingService } from '@services/sorting.service'; import { BaseListingComponent } from '@shared/base/base-listing.component'; import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations'; +import { IconButtonTypes } from '@iqser/common-ui'; @Component({ templateUrl: './file-attributes-listing-screen.component.html', @@ -19,7 +20,8 @@ import { fileAttributeTypesTranslations } from '../../translations/file-attribut providers: [FilterService, SearchService, ScreenStateService, SortingService] }) export class FileAttributesListingScreenComponent extends BaseListingComponent implements OnInit, OnDestroy { - translations = fileAttributeTypesTranslations; + readonly iconButtonTypes = IconButtonTypes; + readonly translations = fileAttributeTypesTranslations; protected readonly _primaryKey = 'label'; private _existingConfiguration: FileAttributesConfig; @ViewChild('fileInput') private _fileInput: ElementRef; diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html index 05dae7061..623ada754 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.html @@ -164,12 +164,12 @@ {{ 'general-config-screen.actions.save' | translate }} - + [type]="iconButtonTypes.show_bg" + > 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 581e22a78..bfb1f492d 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,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .content-container { diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts index 7b616319c..0cc2c4085 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts @@ -13,6 +13,7 @@ import { AutoUnsubscribeComponent } from '../../../shared/base/auto-unsubscribe. import { Toaster } from '../../../../services/toaster.service'; import { LoadingService } from '../../../../services/loading.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { IconButtonTypes } from '@iqser/common-ui'; @Component({ selector: 'redaction-general-config-screen', @@ -20,6 +21,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; styleUrls: ['./general-config-screen.component.scss'] }) export class GeneralConfigScreenComponent extends AutoUnsubscribeComponent implements OnInit { + readonly iconButtonTypes = IconButtonTypes; configForm: FormGroup; smtpForm: FormGroup; 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 8c49b89fc..0138500ea 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,5 @@ @import '../../../../../assets/styles/red-mixins'; -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .content-container { overflow: auto; diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts index 112675cae..73c972123 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.ts @@ -4,9 +4,9 @@ import { LicenseReport, LicenseReportControllerService } from '@redaction/red-ui import { AppConfigService } from '@app-config/app-config.service'; import * as moment from 'moment'; import { TranslateService } from '@ngx-translate/core'; -import { LoadingService } from '@services/loading.service'; -import { ButtonConfig } from '@shared/components/page-header/models/button-config.model'; -import { IconButtonTypes } from '@shared/components/buttons/icon-button/icon-button.component'; +import { LoadingService } from '../../../../services/loading.service'; +import { ButtonConfig } from '../../../shared/components/page-header/models/button-config.model'; +import { IconButtonTypes } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @Component({ @@ -38,7 +38,7 @@ export class LicenseInformationScreenComponent implements OnInit { { label: _('license-info-screen.email-report'), action: () => this.sendMail(), - type: IconButtonTypes.PRIMARY + type: IconButtonTypes.primary } ]; diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.scss index 68b3de75f..880dcd769 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .page-header .actions { diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html index 6952262fc..bdfcc4d7d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html @@ -23,12 +23,12 @@
- + [type]="iconButtonTypes.primary" + >
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts index 65ef95081..fcc31eeb0 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.ts @@ -13,6 +13,7 @@ import { LoadingService } from '../../../../services/loading.service'; import ICodeEditor = monaco.editor.ICodeEditor; import IModelDeltaDecoration = monaco.editor.IModelDeltaDecoration; import IStandaloneEditorConstructionOptions = monaco.editor.IStandaloneEditorConstructionOptions; +import { IconButtonTypes } from '@iqser/common-ui'; @Component({ selector: 'redaction-rules-screen', @@ -20,7 +21,8 @@ import IStandaloneEditorConstructionOptions = monaco.editor.IStandaloneEditorCon styleUrls: ['./rules-screen.component.scss'] }) export class RulesScreenComponent extends ComponentHasChanges implements OnInit { - editorOptions: IStandaloneEditorConstructionOptions = { + readonly iconButtonTypes = IconButtonTypes; + readonly editorOptions: IStandaloneEditorConstructionOptions = { theme: 'vs', language: 'java', automaticLayout: true, diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss index e22f1dd07..24be37ea1 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .header-item { diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html index eafd86902..a764a247b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html @@ -13,13 +13,13 @@ [placeholder]="'user-listing.search' | translate" type="search" > - + [type]="iconButtonTypes.primary" + > implements OnInit { + readonly iconButtonTypes = IconButtonTypes; readonly canDeleteSelected$ = this._canDeleteSelected$; collapsedDetails = false; chartData: DoughnutChartConfig[] = []; - translations = rolesTranslations; + readonly translations = rolesTranslations; protected readonly _primaryKey = 'userId'; @ViewChildren(InitialsAvatarComponent) private readonly _avatars: QueryList; diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html index d9ef81f1f..5b251e724 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html @@ -22,13 +22,13 @@
- + [type]="iconButtonTypes.primary" + >
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss index 894f778bd..e251b5942 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .page-header .actions { display: flex; diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts index 3a4d8fc61..b7ffe527a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.ts @@ -13,6 +13,7 @@ import { BASE_HREF } from '../../../../tokens'; import { stampPDFPage } from '../../../../utils/page-stamper'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { LoadingService } from '../../../../services/loading.service'; +import { IconButtonTypes } from '@iqser/common-ui'; export const DEFAULT_WATERMARK: WatermarkModelRes = { text: null, @@ -21,7 +22,7 @@ export const DEFAULT_WATERMARK: WatermarkModelRes = { fontSize: 11, fontType: 'sans-serif', orientation: WatermarkModelRes.OrientationEnum.DIAGONAL -}; +} as const; @Component({ selector: 'redaction-watermark-screen', @@ -29,6 +30,7 @@ export const DEFAULT_WATERMARK: WatermarkModelRes = { styleUrls: ['./watermark-screen.component.scss'] }) export class WatermarkScreenComponent implements OnInit { + readonly iconButtonTypes = IconButtonTypes; configForm: FormGroup; private _instance: WebViewerInstance; private _watermark: WatermarkModelRes = {}; diff --git a/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.scss b/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.scss index a9168e3ac..a42d25021 100644 --- a/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .annotation-actions { display: none; diff --git a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.scss b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.scss index 9915237b0..0ac6ecc1f 100644 --- a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; :host { display: flex; diff --git a/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.scss b/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.scss index 2b1362ac9..87901023f 100644 --- a/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; :host { diff --git a/apps/red-ui/src/app/modules/dossier/components/dossier-details-stats/dossier-details-stats.component.scss b/apps/red-ui/src/app/modules/dossier/components/dossier-details-stats/dossier-details-stats.component.scss index daf603ca8..4c89b435d 100644 --- a/apps/red-ui/src/app/modules/dossier/components/dossier-details-stats/dossier-details-stats.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/dossier-details-stats/dossier-details-stats.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-components'; @import '../../../../../assets/styles/red-text-styles'; diff --git a/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.scss b/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.scss index aabfd62ce..42166a37b 100644 --- a/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/dossier-details/dossier-details.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .header-wrapper { display: flex; diff --git a/apps/red-ui/src/app/modules/dossier/components/dossier-listing-details/dossier-listing-details.component.scss b/apps/red-ui/src/app/modules/dossier/components/dossier-listing-details/dossier-listing-details.component.scss index 6f60af2c5..d5ecdcf74 100644 --- a/apps/red-ui/src/app/modules/dossier/components/dossier-listing-details/dossier-listing-details.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/dossier-listing-details/dossier-listing-details.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; :host { flex: 1; diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html index 3eaf76ea4..c0c16d70e 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html @@ -147,21 +147,21 @@
- - + + [type]="iconButtonTypes.show_bg" + >
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss index dd8d3aa68..010a90774 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .read-only { @@ -41,7 +41,7 @@ align-items: center; flex-direction: column; - redaction-icon-button { + iqser-icon-button { width: 100%; } } diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts index 57cde0bb2..2c9e3c716 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts @@ -21,6 +21,7 @@ import { FilterModel } from '@shared/components/filters/popup-filter/model/filte import { CommentsComponent } from '../comments/comments.component'; import { PermissionsService } from '@services/permissions.service'; import { WebViewerInstance } from '@pdftron/webviewer'; +import { IconButtonTypes } from '@iqser/common-ui'; const COMMAND_KEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Escape']; const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']; @@ -31,6 +32,8 @@ const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']; styleUrls: ['./file-workload.component.scss'] }) export class FileWorkloadComponent { + readonly iconButtonTypes = IconButtonTypes; + displayedAnnotations: { [key: number]: { annotations: AnnotationWrapper[] } } = {}; @Input() selectedAnnotations: AnnotationWrapper[]; @Input() activeViewerPage: number; diff --git a/apps/red-ui/src/app/modules/dossier/components/needs-work-badge/needs-work-badge.component.scss b/apps/red-ui/src/app/modules/dossier/components/needs-work-badge/needs-work-badge.component.scss index 3e244cd8a..16a25a86a 100644 --- a/apps/red-ui/src/app/modules/dossier/components/needs-work-badge/needs-work-badge.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/needs-work-badge/needs-work-badge.component.scss @@ -1,4 +1,4 @@ -@import 'apps/red-ui/src/assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .needs-work { display: flex; diff --git a/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.scss b/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.scss index c5d6bf1eb..3c6d8e585 100644 --- a/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; :host { diff --git a/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.scss b/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.scss index dd386e81d..30afe7bb5 100644 --- a/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/page-indicator/page-indicator.component.scss @@ -1,7 +1,7 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .page-wrapper { - color: $grey-1; + color: $accent; position: relative; padding: 12px 14px 12px 8px; cursor: pointer; @@ -12,7 +12,7 @@ } &.active { - border-left: 4px solid $red-1; + border-left: 4px solid $primary; } mat-icon { @@ -38,7 +38,7 @@ color: $grey-5; .text { - color: $grey-1; + color: $accent; } } diff --git a/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.scss b/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.scss index 9c85a3acf..436b3cfef 100644 --- a/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/pdf-viewer/pdf-viewer.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .page { display: flex; @@ -79,7 +79,7 @@ padding-right: 4px; &:hover { - color: $grey-1; + color: $accent; } } } diff --git a/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.scss b/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.scss index 259750da0..4667400ec 100644 --- a/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/scroll-button/scroll-button.component.scss @@ -1,4 +1,4 @@ -@import 'apps/red-ui/src/assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .scroll-button { background-color: $white; diff --git a/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.scss b/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.scss index 3b000abab..fd2d72cef 100644 --- a/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/team-members/team-members.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .container { flex-wrap: wrap; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html index b1ff24e25..835ae7efa 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html @@ -82,13 +82,13 @@ {{ 'add-dossier-dialog.actions.save' | translate }} - + [type]="iconButtonTypes.show_bg" + > diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss index b42ed8fc9..dab425932 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .watermark { margin-top: 24px; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 31561a8e1..2337611df 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -5,6 +5,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AppStateService } from '@state/app-state.service'; import * as moment from 'moment'; import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; +import { IconButtonTypes } from '@iqser/common-ui'; @Component({ selector: 'redaction-add-dossier-dialog', @@ -12,6 +13,8 @@ import { downloadTypesTranslations } from '../../../../translations/download-typ styleUrls: ['./add-dossier-dialog.component.scss'] }) export class AddDossierDialogComponent { + readonly iconButtonTypes = IconButtonTypes; + dossierForm: FormGroup; hasDueDate = false; downloadTypesEnum: Dossier.DownloadFileTypesEnum[] = ['ORIGINAL', 'PREVIEW', 'REDACTED']; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html index 5037d8497..24c3abbd0 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html @@ -50,15 +50,15 @@ - + [type]="iconButtonTypes.show_bg" + > (); customAttributes: DossierAttributeWithValue[] = []; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss index d6a46a650..c8b945532 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../assets/styles/red-variables'; +@import '../../../../../../assets/styles/variables'; .download-includes { margin: 16px 0 10px; 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 7eb063989..547ad41ad 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,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .dialog-content { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html index b18f3ed26..cec1ded28 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html @@ -56,12 +56,12 @@
- + [type]="iconButtonTypes.show_bg" + >
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss index 72971f622..99069165f 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../assets/styles/red-variables'; +@import '../../../../../../assets/styles/variables'; .watermark { margin-top: 24px; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 0875a1a88..dd92dcd78 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -12,6 +12,7 @@ import { MatDialogRef } from '@angular/material/dialog'; import { EditDossierDialogComponent } from '../edit-dossier-dialog.component'; import { Toaster } from '@services/toaster.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { IconButtonTypes } from '@iqser/common-ui'; @Component({ selector: 'redaction-edit-dossier-general-info', @@ -19,6 +20,8 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; styleUrls: ['./edit-dossier-general-info.component.scss'] }) export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSectionInterface { + readonly iconButtonTypes = IconButtonTypes; + dossierForm: FormGroup; hasDueDate: boolean; dossierTemplates: DossierTemplateModel[]; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.scss index d101f19d8..1a4ea825d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.scss @@ -1,5 +1,5 @@ @import '../../../../../assets/styles/red-mixins'; -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .content-container { position: relative; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss index a84f71a23..2ada265a7 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .file-upload-input { @@ -29,7 +29,7 @@ cdk-virtual-scroll-viewport { } .error { - color: $red-1; + color: $primary; } .extend-cols { @@ -47,7 +47,7 @@ cdk-virtual-scroll-viewport { align-items: center; justify-content: flex-start; opacity: 0.7; - color: $grey-1; + color: $accent; font-size: 11px; letter-spacing: 0; line-height: 14px; @@ -118,7 +118,7 @@ cdk-virtual-scroll-viewport { .last-opened { > .selection-column { padding-left: 6px !important; - border-left: 4px solid $red-1; + border-left: 4px solid $primary; } > div { @@ -128,7 +128,7 @@ cdk-virtual-scroll-viewport { @keyframes red-fading-background { 0% { - background-color: rgba($red-1, 0.1); + background-color: rgba($primary, 0.1); } 100% { background-color: inherit; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss index 2ba7f35a8..85e82a593 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; .vertical-line { diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.scss b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.scss index c73223165..de52c4111 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.scss +++ b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.scss @@ -1,5 +1,5 @@ @import 'apps/red-ui/src/assets/styles/red-mixins'; -@import 'apps/red-ui/src/assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .content-container { position: relative; 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 4fe813206..5011306cf 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,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .icon { height: 16px; diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss index 9058a325b..70735d33b 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../assets/styles/red-variables'; +@import '../../../../../../assets/styles/variables'; :host { height: var(--size); diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/icon-button/icon-button.component.scss b/apps/red-ui/src/app/modules/shared/components/buttons/icon-button/icon-button.component.scss index cf946631d..1e9d85da0 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/icon-button/icon-button.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/buttons/icon-button/icon-button.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../assets/styles/red-variables'; +@import '../../../../../../assets/styles/variables'; button { padding: 0 14px; 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 a50092b2a..bf378e5b9 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,4 +1,4 @@ -@import '../../../../../../assets/styles/red-variables'; +@import '../../../../../../assets/styles/variables'; :host { button { diff --git a/apps/red-ui/src/app/modules/shared/components/checkbox/round-checkbox.component.scss b/apps/red-ui/src/app/modules/shared/components/checkbox/round-checkbox.component.scss index 07887913b..4993062b2 100644 --- a/apps/red-ui/src/app/modules/shared/components/checkbox/round-checkbox.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/checkbox/round-checkbox.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; :host { cursor: pointer; diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html index 3f45bd76a..3d0f2c75a 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html @@ -62,12 +62,12 @@
- + [type]="iconButtonTypes.primary" + >
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 ccdbe36d5..f1dad3ac6 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,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; :host { @@ -73,7 +73,7 @@ ngx-monaco-editor { position: absolute; right: 12px; top: 8px; - color: $grey-1; + color: $accent; .with-input { display: flex; diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts index 3bdaac889..61740c678 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts @@ -6,6 +6,7 @@ import { Observable } from 'rxjs'; import { map, take } from 'rxjs/operators'; import { DossierWrapper } from '@state/model/dossier.wrapper'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { IconButtonTypes } from '@iqser/common-ui'; import ICodeEditor = monaco.editor.ICodeEditor; import IDiffEditor = monaco.editor.IDiffEditor; import IModelDeltaDecoration = monaco.editor.IModelDeltaDecoration; @@ -21,6 +22,8 @@ const SMOOTH_SCROLL = 0; styleUrls: ['./dictionary-manager.component.scss'] }) export class DictionaryManagerComponent implements OnChanges, OnInit { + readonly iconButtonTypes = IconButtonTypes; + @Input() withFloatingActions = true; @Input() diff --git a/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.html b/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.html index 71fedfada..37b31da41 100644 --- a/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.html +++ b/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.html @@ -11,6 +11,11 @@
{{ text }}
- - + diff --git a/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.scss b/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.scss index 7efc6aa36..997cf9525 100644 --- a/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.scss @@ -17,7 +17,7 @@ } > .heading-l, - redaction-icon-button { + iqser-icon-button { margin-top: 24px; } diff --git a/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.ts b/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.ts index e3376736c..973f75a07 100644 --- a/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/empty-state/empty-state.component.ts @@ -1,4 +1,5 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { IconButtonTypes } from '@iqser/common-ui'; @Component({ selector: 'redaction-empty-state', @@ -7,6 +8,8 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output changeDetection: ChangeDetectionStrategy.OnPush }) export class EmptyStateComponent implements OnInit { + readonly iconButtonTypes = IconButtonTypes; + @Input() text: string; @Input() icon: string; @Input() showButton = true; diff --git a/apps/red-ui/src/app/modules/shared/components/filters/popup-filter/popup-filter.component.html b/apps/red-ui/src/app/modules/shared/components/filters/popup-filter/popup-filter.component.html index 7d27c3f02..6ca6d0404 100644 --- a/apps/red-ui/src/app/modules/shared/components/filters/popup-filter/popup-filter.component.html +++ b/apps/red-ui/src/app/modules/shared/components/filters/popup-filter/popup-filter.component.html @@ -1,10 +1,10 @@ - +> - + > 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 05ad52074..ef6d9d9df 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,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; :host { display: flex; 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 ef7be607f..c2ea5945b 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,4 +1,4 @@ -@import 'apps/red-ui/src/assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; :host { border-radius: 8px; @@ -7,7 +7,7 @@ display: block; &.ng-invalid { - border-color: rgba($red-1, 0.3); + border-color: rgba($primary, 0.3); } } @@ -48,12 +48,12 @@ mat-chip { .mat-chip.mat-standard-chip.mat-chip-selected.mat-primary { background-color: $grey-6; - color: $grey-1; + color: $accent; } .mat-chip.mat-standard-chip { background-color: $white; - color: $grey-1; + color: $accent; margin: 0 0 2px 0; transition: background-color 0.2s; diff --git a/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.scss b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.scss index 2fe13cfdd..b613c0bf5 100644 --- a/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-mixins'; :host { 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 15b8d3f66..b9f005054 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 @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; :host { height: fit-content; diff --git a/apps/red-ui/src/app/modules/shared/components/status-bar/status-bar.component.scss b/apps/red-ui/src/app/modules/shared/components/status-bar/status-bar.component.scss index 9f7bb6620..dbb1e1e5f 100644 --- a/apps/red-ui/src/app/modules/shared/components/status-bar/status-bar.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/status-bar/status-bar.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; .rectangle-container { flex: 1; diff --git a/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.scss b/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.scss index d59b7180c..b8d3cb571 100644 --- a/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-variables'; +@import '../../../../../assets/styles/variables'; :host { display: flex; diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index 87a37d79e..24d494b3e 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -9,7 +9,6 @@ import { PaginationComponent } from './components/pagination/pagination.componen import { ChevronButtonComponent } from './components/buttons/chevron-button/chevron-button.component'; import { CircleButtonComponent } from './components/buttons/circle-button/circle-button.component'; import { FileDownloadBtnComponent } from './components/buttons/file-download-btn/file-download-btn.component'; -import { IconButtonComponent } from './components/buttons/icon-button/icon-button.component'; import { UserButtonComponent } from './components/buttons/user-button/user-button.component'; import { MatConfigModule } from '../mat-config/mat-config.module'; import { IconsModule } from '../icons/icons.module'; @@ -40,8 +39,9 @@ import { InputWithActionComponent } from '@shared/components/input-with-action/i import { PageHeaderComponent } from './components/page-header/page-header.component'; import { DatePipe } from '@shared/pipes/date.pipe'; import { TableHeaderComponent } from './components/table-header/table-header.component'; +import { CommonUiModule } from '@iqser/common-ui'; -const buttons = [ChevronButtonComponent, CircleButtonComponent, FileDownloadBtnComponent, IconButtonComponent, UserButtonComponent]; +const buttons = [ChevronButtonComponent, CircleButtonComponent, FileDownloadBtnComponent, UserButtonComponent]; const components = [ FullPageLoadingIndicatorComponent, @@ -71,7 +71,7 @@ const components = [ const utils = [HumanizePipe, DatePipe, SyncWidthDirective, HasScrollbarDirective, NavigateLastDossiersScreenDirective]; -const modules = [MatConfigModule, TranslateModule, ScrollingModule, IconsModule, FormsModule, ReactiveFormsModule]; +const modules = [MatConfigModule, TranslateModule, ScrollingModule, IconsModule, FormsModule, ReactiveFormsModule, CommonUiModule]; @NgModule({ declarations: [...components, ...utils, TableHeaderComponent], diff --git a/apps/red-ui/src/app/modules/upload-download/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.html b/apps/red-ui/src/app/modules/upload-download/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.html index 5e0191a28..8dad86831 100644 --- a/apps/red-ui/src/app/modules/upload-download/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.html +++ b/apps/red-ui/src/app/modules/upload-download/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.html @@ -16,11 +16,11 @@ mat-flat-button translate="overwrite-files-dialog.options.overwrite" > - + [type]="iconButtonTypes.show_bg" + >
diff --git a/apps/red-ui/src/app/modules/upload-download/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.ts b/apps/red-ui/src/app/modules/upload-download/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.ts index be41c881c..811b5be95 100644 --- a/apps/red-ui/src/app/modules/upload-download/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.ts +++ b/apps/red-ui/src/app/modules/upload-download/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.ts @@ -1,6 +1,7 @@ import { Component, Inject } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { IconButtonTypes } from '@iqser/common-ui'; @Component({ selector: 'redaction-overwrite-files-dialog', @@ -8,6 +9,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; styleUrls: ['./overwrite-files-dialog.component.scss'] }) export class OverwriteFilesDialogComponent { + readonly iconButtonTypes = IconButtonTypes; remember = false; constructor( diff --git a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.scss b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.scss index f6a221de7..c77ef3a1b 100644 --- a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.scss +++ b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.scss @@ -1,4 +1,4 @@ -@import '../../../../assets/styles/red-variables.scss'; +@import '../../../../assets/styles/variables'; section { position: fixed; 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 5cbe615b8..779ea4115 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,4 +1,4 @@ -@import '../../../../assets/styles/red-variables'; +@import '../../../../assets/styles/variables'; @import '../../../../assets/styles/red-mixins'; .red-upload-download-overlay { @@ -19,14 +19,14 @@ padding: 16px 14px 16px 16px; cursor: pointer; - color: $grey-1; + color: $accent; font-size: 13px; font-weight: 600; line-height: 16px; mat-icon { height: 13px; - color: $grey-1; + color: $accent; &.collapse-icon { height: 15px; diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 6cfc820ed..4b001a0b1 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,6 +1,6 @@ { - "OAUTH_URL": "https://dev-06.iqser.cloud/auth/realms/redaction", - "API_URL": "https://dev-06.iqser.cloud/redaction-gateway-v1", + "OAUTH_URL": "https://red-staging.iqser.cloud/auth/realms/redaction", + "API_URL": "https://red-staging.iqser.cloud/redaction-gateway-v1", "OAUTH_CLIENT_ID": "redaction", "BACKEND_APP_VERSION": "4.4.40", "FRONTEND_APP_VERSION": "1.1", diff --git a/apps/red-ui/src/assets/styles/red-variables.scss b/apps/red-ui/src/assets/styles/_variables.scss similarity index 92% rename from apps/red-ui/src/assets/styles/red-variables.scss rename to apps/red-ui/src/assets/styles/_variables.scss index 97c6cdcd7..af515352e 100644 --- a/apps/red-ui/src/assets/styles/red-variables.scss +++ b/apps/red-ui/src/assets/styles/_variables.scss @@ -27,8 +27,11 @@ $orange-1: #ff801a; $pink-1: #f125de; $primary: $red-1; +$primary-2: $red-2; $accent: $grey-1; $light: $white; $dark: $black; +$dark-bg-hover: $grey-4; + $separator: rgba(226, 228, 233, 0.9); diff --git a/apps/red-ui/src/assets/styles/red-autocomplete.scss b/apps/red-ui/src/assets/styles/red-autocomplete.scss index cd517e71b..247dd2133 100644 --- a/apps/red-ui/src/assets/styles/red-autocomplete.scss +++ b/apps/red-ui/src/assets/styles/red-autocomplete.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; @import 'red-mixins'; .mat-autocomplete-panel { diff --git a/apps/red-ui/src/assets/styles/red-breadcrumbs.scss b/apps/red-ui/src/assets/styles/red-breadcrumbs.scss index bf602c541..ebded2f56 100644 --- a/apps/red-ui/src/assets/styles/red-breadcrumbs.scss +++ b/apps/red-ui/src/assets/styles/red-breadcrumbs.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; @import 'red-mixins'; .breadcrumbs-container { @@ -17,7 +17,7 @@ .breadcrumb { text-decoration: none; - color: $grey-1; + color: $accent; font-weight: 600; width: fit-content; white-space: nowrap; diff --git a/apps/red-ui/src/assets/styles/red-button.scss b/apps/red-ui/src/assets/styles/red-button.scss deleted file mode 100644 index cd54d294d..000000000 --- a/apps/red-ui/src/assets/styles/red-button.scss +++ /dev/null @@ -1,116 +0,0 @@ -@import 'red-variables'; - -.mat-button, -.mat-flat-button { - border-radius: 17px !important; - font-size: 13px !important; - height: 34px; - display: flex !important; - align-items: center; - - .mat-button-wrapper { - display: flex; - align-items: center; - line-height: 34px; - transition: opacity 0.2s; - width: 100%; - - > *:not(:last-child) { - margin-right: 6px; - } - - > span { - margin: auto; - } - } - - &.mat-button-disabled { - .mat-button-wrapper { - opacity: 0.3; - } - } -} - -.mat-button-focus-overlay { - opacity: 0 !important; -} - -.mat-flat-button.mat-primary, -.mat-button.primary { - padding: 0 14px; - transition: background-color 0.2s, color 0.2s; - - background-color: $red-1; - - &.mat-button-disabled { - background-color: $red-1; - - .mat-button-wrapper { - color: $white; - opacity: 0.5; - } - } - - &:not(.mat-button-disabled):hover { - background-color: $red-2; - } -} - -redaction-icon-button, -redaction-chevron-button, -redaction-user-button, -redaction-circle-button { - position: relative; - display: flex; - - button { - font-weight: 400 !important; - transition: background-color 0.2s; - - &.overlay { - background: rgba($primary, 0.1); - } - - &:not(.overlay):hover { - background-color: $grey-6; - } - - &.primary { - font-weight: 500 !important; - background-color: $primary; - color: $white; - - &:hover { - background-color: $red-2; - } - } - - &.dark-bg:hover { - background-color: $grey-4; - } - } - - .dot { - background: $primary; - height: 10px; - width: 10px; - border-radius: 50%; - position: absolute; - top: 0; - left: 0; - } -} - -redaction-chevron-button, -redaction-circle-button, -redaction-icon-button { - &[aria-expanded='true'] { - button { - background: rgba($primary, 0.1); - - &.primary { - background: $red-2; - } - } - } -} diff --git a/apps/red-ui/src/assets/styles/red-checkbox.scss b/apps/red-ui/src/assets/styles/red-checkbox.scss index 247f79a59..bd3220f78 100644 --- a/apps/red-ui/src/assets/styles/red-checkbox.scss +++ b/apps/red-ui/src/assets/styles/red-checkbox.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; .mat-checkbox .mat-checkbox-frame { border: 1px solid $grey-5; @@ -33,5 +33,5 @@ } .mat-checkbox.error .mat-checkbox-label { - color: $red-1; + color: $primary; } diff --git a/apps/red-ui/src/assets/styles/red-components.scss b/apps/red-ui/src/assets/styles/red-components.scss index 10aa722de..9f9f46893 100644 --- a/apps/red-ui/src/assets/styles/red-components.scss +++ b/apps/red-ui/src/assets/styles/red-components.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; @import 'red-mixins'; .oval, @@ -29,7 +29,7 @@ &.gray-red { background-color: $grey-6; - color: $red-1; + color: $primary; } &.lightgray-dark { @@ -38,11 +38,11 @@ &.lightgray-red { background-color: $grey-4; - color: $red-1; + color: $primary; } &.darkgray-white { - background-color: $grey-1; + background-color: $accent; color: $white; } @@ -52,7 +52,7 @@ } &.red-white { - background-color: $red-1; + background-color: $primary; color: $white; } @@ -130,8 +130,8 @@ } .PROCESSING { - stroke: $grey-1; - background-color: $grey-1; + stroke: $accent; + background-color: $accent; } .OCR_PROCESSING, @@ -141,13 +141,13 @@ } .REPROCESS { - stroke: $grey-1; - background-color: $grey-1; + stroke: $accent; + background-color: $accent; } .FULLREPROCESS { - stroke: $grey-1; - background-color: $grey-1; + stroke: $accent; + background-color: $accent; } .EXCLUDED { @@ -156,8 +156,8 @@ } .ERROR { - stroke: lighten($red-1, 25%); - background-color: lighten($red-1, 25%); + stroke: lighten($primary, 25%); + background-color: lighten($primary, 25%); } .ACTIVE { @@ -177,8 +177,8 @@ .MANAGER, .MANAGER_ADMIN { - stroke: $red-1; - background-color: $red-1; + stroke: $primary; + background-color: $primary; } .overlay-shadow { diff --git a/apps/red-ui/src/assets/styles/red-controls.scss b/apps/red-ui/src/assets/styles/red-controls.scss index 919a592f1..bd9fcc563 100644 --- a/apps/red-ui/src/assets/styles/red-controls.scss +++ b/apps/red-ui/src/assets/styles/red-controls.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; .btn-group { display: flex; diff --git a/apps/red-ui/src/assets/styles/red-dialog.scss b/apps/red-ui/src/assets/styles/red-dialog.scss index d46f7c990..2b1824205 100644 --- a/apps/red-ui/src/assets/styles/red-dialog.scss +++ b/apps/red-ui/src/assets/styles/red-dialog.scss @@ -1,7 +1,7 @@ -@import './red-variables'; +@import 'variables'; .mat-dialog-container { - color: $grey-1; + color: $accent; padding: 0 !important; border-radius: 8px !important; } diff --git a/apps/red-ui/src/assets/styles/red-editor.scss b/apps/red-ui/src/assets/styles/red-editor.scss index acd3cf62a..e7d8ca367 100644 --- a/apps/red-ui/src/assets/styles/red-editor.scss +++ b/apps/red-ui/src/assets/styles/red-editor.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; @import 'red-mixins'; .changed-row-marker { diff --git a/apps/red-ui/src/assets/styles/red-grid.scss b/apps/red-ui/src/assets/styles/red-grid.scss index 8f11626e9..72e1b083c 100644 --- a/apps/red-ui/src/assets/styles/red-grid.scss +++ b/apps/red-ui/src/assets/styles/red-grid.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; @import 'red-mixins'; .header-item { diff --git a/apps/red-ui/src/assets/styles/red-input.scss b/apps/red-ui/src/assets/styles/red-input.scss index c33a8a099..c87d57727 100644 --- a/apps/red-ui/src/assets/styles/red-input.scss +++ b/apps/red-ui/src/assets/styles/red-input.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; @import 'red-mixins'; form { @@ -43,7 +43,7 @@ form { mat-icon { width: 14px; height: 14px; - color: $grey-1; + color: $accent; } &.disabled { @@ -62,7 +62,7 @@ form { .mat-form-field-label { opacity: 0.7 !important; - color: $grey-1 !important; + color: $accent !important; transform: translateY(-1.34em) !important; } @@ -110,25 +110,25 @@ form { } &:focus { - border-color: $grey-1; + border-color: $accent; } &::placeholder { - color: $grey-1; + color: $accent; opacity: 0.7; } &.ng-invalid.ng-touched { - border-color: rgba($red-1, 0.3); + border-color: rgba($primary, 0.3); &:focus { - border-color: $red-1; + border-color: $primary; } } &:disabled { background-color: $grey-2; - color: rgba($grey-1, 0.3); + color: rgba($accent, 0.3); } } @@ -169,7 +169,7 @@ form { letter-spacing: 0; line-height: 14px; margin-bottom: 2px; - color: $grey-1; + color: $accent; &.mat-checkbox-layout { opacity: 1; diff --git a/apps/red-ui/src/assets/styles/red-list.scss b/apps/red-ui/src/assets/styles/red-list.scss index 48289a7b9..506c9a718 100644 --- a/apps/red-ui/src/assets/styles/red-list.scss +++ b/apps/red-ui/src/assets/styles/red-list.scss @@ -1,7 +1,7 @@ -@import 'red-variables'; +@import 'variables'; .mat-list-item { - color: $grey-1 !important; + color: $accent !important; font-size: 13px !important; line-height: 16px !important; } diff --git a/apps/red-ui/src/assets/styles/red-material-theme.scss b/apps/red-ui/src/assets/styles/red-material-theme.scss index 5a241b1fe..52308f0a6 100644 --- a/apps/red-ui/src/assets/styles/red-material-theme.scss +++ b/apps/red-ui/src/assets/styles/red-material-theme.scss @@ -1,13 +1,13 @@ @use '~@angular/material' as mat; -@import 'red-variables'; +@import 'variables'; @include mat.core(); $primary-palette: ( - default: $red-1, - lighter: lighten($red-1, 30%), - darker: darken($red-1, 30%), - text: $red-1, + default: $primary, + lighter: lighten($primary, 30%), + darker: darken($primary, 30%), + text: $primary, contrast: ( default: $light, lighter: $light, @@ -16,10 +16,10 @@ $primary-palette: ( ); $secondary-palette: ( - default: $grey-1, - lighter: lighten($grey-1, 30%), - darker: darken($grey-1, 30%), - text: $grey-1, + default: $accent, + lighter: lighten($accent, 30%), + darker: darken($accent, 30%), + text: $accent, contrast: ( default: $light, lighter: $light, @@ -28,10 +28,10 @@ $secondary-palette: ( ); $red-palette: ( - default: $red-1, - lighter: lighten($red-1, 30%), - darker: darken($red-1, 30%), - text: $red-1, + default: $primary, + lighter: lighten($primary, 30%), + darker: darken($primary, 30%), + text: $primary, contrast: ( default: $light, lighter: $light, diff --git a/apps/red-ui/src/assets/styles/red-menu.scss b/apps/red-ui/src/assets/styles/red-menu.scss index 41e5d63ec..65b94e05f 100644 --- a/apps/red-ui/src/assets/styles/red-menu.scss +++ b/apps/red-ui/src/assets/styles/red-menu.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; .mat-menu-panel { border-radius: 8px !important; diff --git a/apps/red-ui/src/assets/styles/red-mixins.scss b/apps/red-ui/src/assets/styles/red-mixins.scss index 3928ec4c5..7236bd77b 100644 --- a/apps/red-ui/src/assets/styles/red-mixins.scss +++ b/apps/red-ui/src/assets/styles/red-mixins.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; @mixin line-clamp($lines) { display: -webkit-box; diff --git a/apps/red-ui/src/assets/styles/red-page-layout.scss b/apps/red-ui/src/assets/styles/red-page-layout.scss index f3cd96c22..36e12ba11 100644 --- a/apps/red-ui/src/assets/styles/red-page-layout.scss +++ b/apps/red-ui/src/assets/styles/red-page-layout.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; @import 'red-mixins'; html, @@ -333,7 +333,7 @@ section.settings { .divider { height: 1px; opacity: 0.15; - background-color: $grey-1; + background-color: $accent; } } diff --git a/apps/red-ui/src/assets/styles/red-progress-bar.scss b/apps/red-ui/src/assets/styles/red-progress-bar.scss index 71f52195e..22eadd163 100644 --- a/apps/red-ui/src/assets/styles/red-progress-bar.scss +++ b/apps/red-ui/src/assets/styles/red-progress-bar.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; .mat-progress-bar { height: 6px; diff --git a/apps/red-ui/src/assets/styles/red-select.scss b/apps/red-ui/src/assets/styles/red-select.scss index eaf80a030..1a9c3b0ac 100644 --- a/apps/red-ui/src/assets/styles/red-select.scss +++ b/apps/red-ui/src/assets/styles/red-select.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; .mat-select-panel .mat-option { &:hover:not(.mat-option-disabled), @@ -8,7 +8,7 @@ &.mat-selected:not(.mat-option-multiple) { background-color: rgba($primary, 0.2); - color: $grey-1; + color: $accent; } } diff --git a/apps/red-ui/src/assets/styles/red-slider.scss b/apps/red-ui/src/assets/styles/red-slider.scss index db97150e2..4e2e4e181 100644 --- a/apps/red-ui/src/assets/styles/red-slider.scss +++ b/apps/red-ui/src/assets/styles/red-slider.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; .mat-slider-horizontal { width: 140px; diff --git a/apps/red-ui/src/assets/styles/red-tables.scss b/apps/red-ui/src/assets/styles/red-tables.scss index ba093c1d9..1aa5820a1 100644 --- a/apps/red-ui/src/assets/styles/red-tables.scss +++ b/apps/red-ui/src/assets/styles/red-tables.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; @import 'red-mixins'; .default-table { diff --git a/apps/red-ui/src/assets/styles/red-tabs.scss b/apps/red-ui/src/assets/styles/red-tabs.scss index 8cbc5e753..d6353c88f 100644 --- a/apps/red-ui/src/assets/styles/red-tabs.scss +++ b/apps/red-ui/src/assets/styles/red-tabs.scss @@ -1,4 +1,4 @@ -@import './red-variables'; +@import 'variables'; .red-tab { &:not(:last-child) { @@ -23,7 +23,7 @@ } &.disabled { - color: rgba($grey-1, 0.3); + color: rgba($accent, 0.3); cursor: not-allowed; } } diff --git a/apps/red-ui/src/assets/styles/red-text-styles.scss b/apps/red-ui/src/assets/styles/red-text-styles.scss index b80aa2226..6da1afefc 100644 --- a/apps/red-ui/src/assets/styles/red-text-styles.scss +++ b/apps/red-ui/src/assets/styles/red-text-styles.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; @import 'red-mixins'; a { @@ -97,7 +97,7 @@ pre { } .large-label { - color: $grey-1; + color: $accent; font-size: 13px; line-height: 16px; } diff --git a/apps/red-ui/src/assets/styles/red-theme.scss b/apps/red-ui/src/assets/styles/red-theme.scss index c90b38a4a..1e411145a 100644 --- a/apps/red-ui/src/assets/styles/red-theme.scss +++ b/apps/red-ui/src/assets/styles/red-theme.scss @@ -5,7 +5,6 @@ @import 'red-text-styles'; @import 'red-dialog'; @import 'red-input'; -@import 'red-button'; @import 'red-select'; @import 'red-autocomplete'; @import 'red-list'; diff --git a/apps/red-ui/src/assets/styles/red-toasts.scss b/apps/red-ui/src/assets/styles/red-toasts.scss index 99c230e0c..bd230786c 100644 --- a/apps/red-ui/src/assets/styles/red-toasts.scss +++ b/apps/red-ui/src/assets/styles/red-toasts.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; $toast-width: 400px; @@ -70,11 +70,11 @@ $toast-width: 400px; .toast-warning, .toast-success { .toast-message { - color: $grey-1; + color: $accent; } .toast-close-button { - color: $grey-1; + color: $accent; } } @@ -90,17 +90,17 @@ $toast-width: 400px; } .toast-error { - background-color: $red-1; + background-color: $primary; color: $white; } .toast-warning { background-color: $yellow-2; - color: $grey-1; + color: $accent; } .toast-info { - background-color: $grey-1; + background-color: $accent; } .inline-dialog-toast { diff --git a/apps/red-ui/src/assets/styles/red-toggle-button.scss b/apps/red-ui/src/assets/styles/red-toggle-button.scss index 13bea0ab6..23758c898 100644 --- a/apps/red-ui/src/assets/styles/red-toggle-button.scss +++ b/apps/red-ui/src/assets/styles/red-toggle-button.scss @@ -1,4 +1,4 @@ -@import './red-variables'; +@import 'variables'; .mat-button-toggle-standalone, .mat-button-toggle-group { diff --git a/apps/red-ui/src/assets/styles/red-toggle.scss b/apps/red-ui/src/assets/styles/red-toggle.scss index b4cadc526..d82c96f82 100644 --- a/apps/red-ui/src/assets/styles/red-toggle.scss +++ b/apps/red-ui/src/assets/styles/red-toggle.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; .mat-slide-toggle { .mat-slide-toggle-bar { diff --git a/apps/red-ui/src/assets/styles/red-tooltips.scss b/apps/red-ui/src/assets/styles/red-tooltips.scss index b7d8e6f77..3e4f60d72 100644 --- a/apps/red-ui/src/assets/styles/red-tooltips.scss +++ b/apps/red-ui/src/assets/styles/red-tooltips.scss @@ -1,4 +1,4 @@ -@import 'red-variables'; +@import 'variables'; .mat-tooltip { background-color: $accent; diff --git a/apps/red-ui/src/styles.scss b/apps/red-ui/src/styles.scss index f2cec9162..2b4844453 100644 --- a/apps/red-ui/src/styles.scss +++ b/apps/red-ui/src/styles.scss @@ -1,2 +1,2 @@ /* You can add global styles to this file, and also import other style files */ -@import './assets/styles/red-theme'; +@import 'assets/styles/red-theme'; diff --git a/libs/common-ui b/libs/common-ui index cc4b18753..004d821e3 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit cc4b18753086a30ccf40a56092be4e7330b3d592 +Subproject commit 004d821e31099b88e3f67ad9478b56b3372a26ed diff --git a/paligo-styles/footer.scss b/paligo-styles/footer.scss index 0b4da5e57..47cbce181 100644 --- a/paligo-styles/footer.scss +++ b/paligo-styles/footer.scss @@ -1,4 +1,4 @@ -@import '../apps/red-ui/src/assets/styles/red-variables'; +@import '../apps/red-ui/src/assets/styles/variables'; @import 'mixin'; .portal-footer, diff --git a/paligo-styles/header.scss b/paligo-styles/header.scss index 5d9afe612..b782d64b8 100644 --- a/paligo-styles/header.scss +++ b/paligo-styles/header.scss @@ -1,4 +1,4 @@ -@import '../apps/red-ui/src/assets/styles/red-variables'; +@import '../apps/red-ui/src/assets/styles/variables'; @import 'mixin'; .portal-header { diff --git a/paligo-styles/homepage.scss b/paligo-styles/homepage.scss index 45d3aa3e8..496e6321a 100644 --- a/paligo-styles/homepage.scss +++ b/paligo-styles/homepage.scss @@ -1,4 +1,4 @@ -@import '../apps/red-ui/src/assets/styles/red-variables'; +@import '../apps/red-ui/src/assets/styles/variables'; @import 'mixin'; .portal-publications, diff --git a/paligo-styles/manual-sidebar.scss b/paligo-styles/manual-sidebar.scss index abdc8c4fd..08c4d61ff 100644 --- a/paligo-styles/manual-sidebar.scss +++ b/paligo-styles/manual-sidebar.scss @@ -1,9 +1,9 @@ -@import '../apps/red-ui/src/assets/styles/red-variables'; +@import '../apps/red-ui/src/assets/styles/variables'; @import '../apps/red-ui/src/assets/styles/red-mixins'; @import 'mixin'; .site-sidebar { - background-color: $grey-1; + background-color: $accent; .logo { padding: 24px 0 30px 0 !important; diff --git a/paligo-styles/manual.scss b/paligo-styles/manual.scss index f99e2f460..9170635c5 100644 --- a/paligo-styles/manual.scss +++ b/paligo-styles/manual.scss @@ -1,4 +1,4 @@ -@import '../apps/red-ui/src/assets/styles/red-variables'; +@import '../apps/red-ui/src/assets/styles/variables'; @import 'manual-sidebar'; .toolbar { @@ -13,16 +13,16 @@ font-weight: 600; a { - color: $grey-1; + color: $accent; &:hover { - color: $red-1; + color: $primary; text-decoration: underline; } } .breadcrumb-node { - color: $red-1; + color: $primary; } } @@ -66,10 +66,10 @@ main article { margin-bottom: 32px; padding: 16px 24px 16px 68px; background-color: $white; - border-left: 4px solid $red-1; + border-left: 4px solid $primary; &:before { - color: $red-1; + color: $primary; width: 20px; height: 20px; text-align: center; diff --git a/paligo-styles/mixin.scss b/paligo-styles/mixin.scss index d0e9a541b..d39b54307 100644 --- a/paligo-styles/mixin.scss +++ b/paligo-styles/mixin.scss @@ -1,4 +1,4 @@ -@import '../apps/red-ui/src/assets/styles/red-variables'; +@import '../apps/red-ui/src/assets/styles/variables'; @mixin search-input { .search-field { @@ -61,7 +61,7 @@ } @mixin button { - color: $red-1; + color: $primary; font-size: 14px; font-weight: 600; line-height: 19px; @@ -74,7 +74,7 @@ &:hover { text-decoration: underline; background-color: transparent; - color: $red-1; + color: $primary; } } diff --git a/paligo-styles/search.scss b/paligo-styles/search.scss index de70de9b5..d872af42a 100644 --- a/paligo-styles/search.scss +++ b/paligo-styles/search.scss @@ -1,4 +1,4 @@ -@import '../apps/red-ui/src/assets/styles/red-variables'; +@import '../apps/red-ui/src/assets/styles/variables'; @import 'mixin'; .portal-search-result { diff --git a/paligo-styles/style.scss b/paligo-styles/style.scss index 3dfea03b4..ef0bde074 100644 --- a/paligo-styles/style.scss +++ b/paligo-styles/style.scss @@ -1,4 +1,4 @@ -@import '../apps/red-ui/src/assets/styles/red-variables'; +@import '../apps/red-ui/src/assets/styles/variables'; @import '../apps/red-ui/src/assets/styles/red-mixins'; @import 'fonts'; @import 'header'; diff --git a/tsconfig.base.json b/tsconfig.base.json index 3218e8111..add38d420 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -30,7 +30,7 @@ "@shared/*": ["apps/red-ui/src/app/modules/shared/*"], "@app-config/*": ["apps/red-ui/src/app/modules/app-config/*"], "@upload-download/*": ["apps/red-ui/src/app/modules/upload-download/*"], - "@devplant/common-ui": ["libs/common-ui/src/index.ts"] + "@iqser/common-ui": ["libs/common-ui/src/index.ts"] } }, "exclude": ["node_modules", "tmp"],