From 951202a3fa93b51582a6c5db27c7a1bfc071f038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 24 Aug 2021 00:12:29 +0200 Subject: [PATCH] Error page --- apps/red-ui/src/app/app.component.html | 1 + .../base-screen/base-screen.component.scss | 5 +- .../user-profile-screen.component.scss | 3 +- ...ttributes-csv-import-dialog.component.scss | 2 +- .../dictionary-listing-screen.component.scss | 3 - .../dictionary-overview-screen.component.scss | 3 - ...r-attributes-listing-screen.component.scss | 46 +++++----- ...er-templates-listing-screen.component.scss | 45 ++++------ ...e-attributes-listing-screen.component.scss | 6 +- .../general-config-screen.component.scss | 2 +- .../license-information-screen.component.scss | 2 +- .../reports/reports-screen.component.scss | 2 +- .../screens/rules/rules-screen.component.scss | 2 - .../screens/trash/trash-screen.component.scss | 7 -- .../user-listing-screen.component.scss | 36 +++----- .../document-info.component.scss | 2 +- .../dossier-details-stats.component.scss | 2 +- .../file-workload.component.scss | 2 +- .../page-exclusion.component.scss | 2 +- .../team-members-manager.component.scss | 2 +- ...t-dossier-deleted-documents.component.scss | 2 +- .../edit-dossier-dialog.component.scss | 2 +- .../dossier-listing-screen.component.scss | 1 - .../dossier-overview-screen.component.scss | 11 --- .../file-preview-screen.component.scss | 1 - .../search-screen.component.scss | 2 +- .../dictionary-manager.component.scss | 1 - .../empty-state/empty-state.component.scss | 2 +- .../side-nav/side-nav.component.scss | 2 +- .../upload-status-overlay.component.scss | 2 +- apps/red-ui/src/assets/i18n/en.json | 4 + .../red-ui/src/assets/icons/general/error.svg | 14 --- .../src/assets/styles/red-autocomplete.scss | 2 +- .../src/assets/styles/red-breadcrumbs.scss | 2 +- .../src/assets/styles/red-components.scss | 2 +- apps/red-ui/src/assets/styles/red-editor.scss | 1 - apps/red-ui/src/assets/styles/red-menu.scss | 2 +- apps/red-ui/src/assets/styles/red-mixins.scss | 23 ----- .../src/assets/styles/red-page-layout.scss | 2 +- apps/red-ui/src/assets/styles/red-select.scss | 2 +- apps/red-ui/src/assets/styles/red-tables.scss | 2 +- .../src/assets/styles/red-text-styles.scss | 87 ------------------- apps/red-ui/src/assets/styles/red-theme.scss | 1 - package.json | 2 +- paligo-styles/manual-sidebar.scss | 2 +- paligo-styles/style.scss | 2 +- 46 files changed, 83 insertions(+), 268 deletions(-) delete mode 100755 apps/red-ui/src/assets/icons/general/error.svg delete mode 100644 apps/red-ui/src/assets/styles/red-mixins.scss delete mode 100644 apps/red-ui/src/assets/styles/red-text-styles.scss diff --git a/apps/red-ui/src/app/app.component.html b/apps/red-ui/src/app/app.component.html index f77b69da4..ff64625af 100644 --- a/apps/red-ui/src/app/app.component.html +++ b/apps/red-ui/src/app/app.component.html @@ -1,2 +1,3 @@ + 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 b573da15f..ab6144a7f 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,9 +1,8 @@ @import '../../../assets/styles/variables'; -@import '../../../assets/styles/red-mixins'; .dev-mode { - background-color: #dd4d50; - color: #fff; + background-color: $primary; + color: $white; font-size: 22px; line-height: 16px; text-align: center; diff --git a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.scss b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.scss index 202a9da9c..368dd3150 100644 --- a/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.scss +++ b/apps/red-ui/src/app/components/user-profile/user-profile-screen.component.scss @@ -1,4 +1,5 @@ -@import '../../../assets/styles/red-mixins'; +@import '../../../assets/styles/variables'; +@import 'libs/common-ui/src/assets/styles/mixins'; .content-container { background-color: $grey-2; 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 e764e0db1..8d55816f0 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,5 +1,5 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .sub-header { display: flex; 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 d1d12b4c9..ef2c038ad 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,6 +1,3 @@ -@import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; - iqser-table-header::ng-deep .header-item { padding-right: 16px; } 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 b35b035bc..1078732a2 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,6 +1,3 @@ -@import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; - .right-container { width: 353px; min-width: 353px; diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.scss index d6144291e..187b51b58 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.scss @@ -1,38 +1,34 @@ -@import '../../../../../assets/styles/red-mixins'; - .page-header .actions { display: flex; justify-content: flex-end; } -.header-item { - padding: 0 24px 0 10px; -} +iqser-table-header::ng-deep .attributes-actions-container { + display: flex; + flex: 1; + justify-content: flex-end; -iqser-table-column-name::ng-deep { - > div { - padding-left: 10px !important; + > *:not(:last-child) { + margin-right: 10px; } } -.content-container { - cdk-virtual-scroll-viewport { +cdk-virtual-scroll-viewport { + ::ng-deep.cdk-virtual-scroll-content-wrapper { + grid-template-columns: auto 2fr 2fr 1fr 1fr 11px; + + .table-item > div { + height: 50px; + + &:not(.scrollbar-placeholder) { + padding-left: 10px; + } + } + } + + &.has-scrollbar:hover { ::ng-deep.cdk-virtual-scroll-content-wrapper { - grid-template-columns: auto 2fr 2fr 1fr 1fr 11px; - - .table-item > div { - height: 50px; - - &:not(.scrollbar-placeholder) { - padding-left: 10px; - } - } - } - - &.has-scrollbar:hover { - ::ng-deep.cdk-virtual-scroll-content-wrapper { - grid-template-columns: auto 2fr 2fr 1fr 1fr; - } + grid-template-columns: auto 2fr 2fr 1fr 1fr; } } } 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 5d6ba5f25..351bb7095 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,40 +1,25 @@ -@import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; +cdk-virtual-scroll-viewport { + ::ng-deep.cdk-virtual-scroll-content-wrapper { + grid-template-columns: auto 1fr 1fr 1fr 1fr 11px; -.header-item { - padding: 0 24px 0 10px; -} + .table-item { + > div:not(.scrollbar-placeholder) { + padding-left: 10px; -iqser-table-column-name::ng-deep { - > div { - padding-left: 10px !important; - } -} + .stats-subtitle { + margin-top: 4px; + } -.content-container { - cdk-virtual-scroll-viewport { - ::ng-deep.cdk-virtual-scroll-content-wrapper { - grid-template-columns: auto 1fr 1fr 1fr 1fr 11px; - - .table-item { - > div:not(.scrollbar-placeholder) { - padding-left: 10px; - - .stats-subtitle { - margin-top: 4px; - } - - .table-item-title { - max-width: 100%; - } + .table-item-title { + max-width: 100%; } } } + } - &.has-scrollbar:hover { - ::ng-deep.cdk-virtual-scroll-content-wrapper { - grid-template-columns: auto 1fr 1fr 1fr 1fr; - } + &.has-scrollbar:hover { + ::ng-deep.cdk-virtual-scroll-content-wrapper { + grid-template-columns: auto 1fr 1fr 1fr 1fr; } } } diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss index 1eae4af34..dc6d57c73 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.scss @@ -1,14 +1,10 @@ -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .page-header .actions { display: flex; justify-content: flex-end; } -iqser-table-header::ng-deep .header-item { - padding: 0 24px 0 10px; -} - .content-container cdk-virtual-scroll-viewport { ::ng-deep.cdk-virtual-scroll-content-wrapper { grid-template-columns: auto 2fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 11px; 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 bfb1f492d..7edcb0e43 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,5 +1,5 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .content-container { background-color: $grey-2; 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 0138500ea..c8023043a 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,4 +1,4 @@ -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; @import '../../../../../assets/styles/variables'; .content-container { 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 765202e19..f8079405b 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,5 +1,5 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .page-header .actions { display: flex; diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.scss index f13889c9b..556ceecf7 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.scss @@ -1,5 +1,3 @@ -@import '../../../../../assets/styles/red-mixins'; - .editor-container { width: 100%; padding: 15px; 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 9bebde5ca..f1ade43fa 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,5 +1,4 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; .bulk-actions { display: flex; @@ -10,12 +9,6 @@ } } -iqser-table-column-name::ng-deep { - > div { - padding-left: 10px !important; - } -} - .content-container { cdk-virtual-scroll-viewport { ::ng-deep.cdk-virtual-scroll-content-wrapper { diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.scss index 004790301..73674cbd8 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.scss @@ -1,33 +1,21 @@ -.content-container { - .header-item { - padding: 0 24px 0 10px; - } +cdk-virtual-scroll-viewport { + ::ng-deep.cdk-virtual-scroll-content-wrapper { + grid-template-columns: auto 2fr 1fr 1fr 1fr auto 11px; - iqser-table-column-name::ng-deep { - > div { - padding: 0 13px 0 10px !important; - } - } + .table-item { + > div:not(.scrollbar-placeholder) { + padding-left: 10px; - cdk-virtual-scroll-viewport { - ::ng-deep.cdk-virtual-scroll-content-wrapper { - grid-template-columns: auto 2fr 1fr 1fr 1fr auto 11px; - - .table-item { - > div:not(.scrollbar-placeholder) { - padding-left: 10px; - - &.center { - align-items: center; - } + &.center { + align-items: center; } } } + } - &.has-scrollbar:hover { - ::ng-deep.cdk-virtual-scroll-content-wrapper { - grid-template-columns: auto 2fr 1fr 1fr 1fr auto; - } + &.has-scrollbar:hover { + ::ng-deep.cdk-virtual-scroll-content-wrapper { + grid-template-columns: auto 2fr 1fr 1fr 1fr auto; } } } 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 4cbdca5e8..11319af19 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,5 +1,5 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; :host { display: block; 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 4c89b435d..3d9becd36 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,6 +1,6 @@ @import '../../../../../assets/styles/variables'; @import '../../../../../assets/styles/red-components'; -@import '../../../../../assets/styles/red-text-styles'; +@import 'libs/common-ui/src/assets/styles/texts'; :host { @extend .stats-subtitle; 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 c4e28e2a7..ff0fa3eb8 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,5 +1,5 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .read-only { padding: 13px 16px; 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 3d8347c0d..35e24217b 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,5 +1,5 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; :host { height: 100%; diff --git a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.scss b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.scss index 4fe9ada25..acfdf0a52 100644 --- a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .search-container { margin-top: 16px; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.scss index b2e5fe998..31eed9396 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.scss @@ -1,5 +1,5 @@ @import '../../../../../../assets/styles/variables'; -@import '../../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .instructions { color: $grey-7; 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 588114d3c..de65aecb7 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,5 +1,5 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .dialog-content { padding: 0; 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 1a4ea825d..fb03fe4e9 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,4 +1,3 @@ -@import '../../../../../assets/styles/red-mixins'; @import '../../../../../assets/styles/variables'; .content-container { 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 959f49696..ded2aa696 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,5 +1,4 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; :root { --dynamic-columns: '1fr'; @@ -9,16 +8,6 @@ display: none; } -.header-item { - padding: 0 24px 0 10px; -} - -iqser-table-column-name::ng-deep { - > div { - padding-left: 10px !important; - } -} - cdk-virtual-scroll-viewport { ::ng-deep.cdk-virtual-scroll-content-wrapper { grid-template-columns: auto 3fr 2fr repeat(var(--dynamic-columns, 1), 1fr) 2fr 1fr auto 11px; 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 85e82a593..4c58808d2 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,5 +1,4 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; .vertical-line { width: 1px; 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 de52c4111..42cde13ac 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,4 +1,4 @@ -@import 'apps/red-ui/src/assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; @import '../../../../../assets/styles/variables'; .content-container { 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 f9469e4d1..f703f198d 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss @@ -1,5 +1,4 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; :host { width: 100%; 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 997cf9525..2676a3071 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 @@ -1,4 +1,4 @@ -@import '../../../../../assets/styles/red-mixins'; +@import '../../../../../assets/styles/variables'; .empty-state { display: flex; 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 b613c0bf5..0c3c6579f 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,5 +1,5 @@ @import '../../../../../assets/styles/variables'; -@import '../../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; :host { display: block; 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 779ea4115..bee43a2a5 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,5 +1,5 @@ @import '../../../../assets/styles/variables'; -@import '../../../../assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .red-upload-download-overlay { background: $white; diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 318b5c45b..fcee44c26 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -846,6 +846,10 @@ "side-nav-title": "Configurations", "unsaved-changes": "You have unsaved changes. Save or revert before changing the tab." }, + "error": { + "generic": "Oops! Something went wrong...", + "reload": "Reload" + }, "exact-date": "{day} {month} {year} at {hour}:{minute}", "file": "File", "file-attribute-types": { diff --git a/apps/red-ui/src/assets/icons/general/error.svg b/apps/red-ui/src/assets/icons/general/error.svg deleted file mode 100755 index 583e7d9e4..000000000 --- a/apps/red-ui/src/assets/icons/general/error.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/apps/red-ui/src/assets/styles/red-autocomplete.scss b/apps/red-ui/src/assets/styles/red-autocomplete.scss index 247dd2133..c7c1f171e 100644 --- a/apps/red-ui/src/assets/styles/red-autocomplete.scss +++ b/apps/red-ui/src/assets/styles/red-autocomplete.scss @@ -1,5 +1,5 @@ @import 'variables'; -@import 'red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .mat-autocomplete-panel { @include scroll-bar; diff --git a/apps/red-ui/src/assets/styles/red-breadcrumbs.scss b/apps/red-ui/src/assets/styles/red-breadcrumbs.scss index ebded2f56..b82e18960 100644 --- a/apps/red-ui/src/assets/styles/red-breadcrumbs.scss +++ b/apps/red-ui/src/assets/styles/red-breadcrumbs.scss @@ -1,5 +1,5 @@ @import 'variables'; -@import 'red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .breadcrumbs-container { display: flex; diff --git a/apps/red-ui/src/assets/styles/red-components.scss b/apps/red-ui/src/assets/styles/red-components.scss index 9f9f46893..a21ebad07 100644 --- a/apps/red-ui/src/assets/styles/red-components.scss +++ b/apps/red-ui/src/assets/styles/red-components.scss @@ -1,5 +1,5 @@ @import 'variables'; -@import 'red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .oval, .square { diff --git a/apps/red-ui/src/assets/styles/red-editor.scss b/apps/red-ui/src/assets/styles/red-editor.scss index e7d8ca367..ac37e71e5 100644 --- a/apps/red-ui/src/assets/styles/red-editor.scss +++ b/apps/red-ui/src/assets/styles/red-editor.scss @@ -1,5 +1,4 @@ @import 'variables'; -@import 'red-mixins'; .changed-row-marker { background: rgba($primary, 0.1); diff --git a/apps/red-ui/src/assets/styles/red-menu.scss b/apps/red-ui/src/assets/styles/red-menu.scss index 567c4b3b8..89603ebde 100644 --- a/apps/red-ui/src/assets/styles/red-menu.scss +++ b/apps/red-ui/src/assets/styles/red-menu.scss @@ -1,5 +1,5 @@ @import 'variables'; -@import 'red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .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 deleted file mode 100644 index c0616e1a8..000000000 --- a/apps/red-ui/src/assets/styles/red-mixins.scss +++ /dev/null @@ -1,23 +0,0 @@ -@import '../../../../../libs/common-ui/src/assets/styles/mixins'; -@import 'variables'; - -@mixin line-clamp($lines) { - display: -webkit-box; - -webkit-line-clamp: $lines; - -webkit-box-orient: vertical; - overflow: hidden; - display: block; - - @if $lines == 1 { - text-overflow: ellipsis; - white-space: nowrap; - } -} - -@mixin inset-shadow { - box-shadow: inset 0 4px 3px -2px $grey-4; -} - -@mixin drop-shadow { - box-shadow: 0 4px 3px 2px $grey-4; -} 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 c4db504ff..faa75892c 100644 --- a/apps/red-ui/src/assets/styles/red-page-layout.scss +++ b/apps/red-ui/src/assets/styles/red-page-layout.scss @@ -1,5 +1,5 @@ @import 'variables'; -@import 'red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; html, body { diff --git a/apps/red-ui/src/assets/styles/red-select.scss b/apps/red-ui/src/assets/styles/red-select.scss index 2efdd6510..b2a8ba192 100644 --- a/apps/red-ui/src/assets/styles/red-select.scss +++ b/apps/red-ui/src/assets/styles/red-select.scss @@ -1,5 +1,5 @@ @import 'variables'; -@import 'red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .mat-select-panel { @include scroll-bar; diff --git a/apps/red-ui/src/assets/styles/red-tables.scss b/apps/red-ui/src/assets/styles/red-tables.scss index 0f5896492..e4a517bd0 100644 --- a/apps/red-ui/src/assets/styles/red-tables.scss +++ b/apps/red-ui/src/assets/styles/red-tables.scss @@ -1,5 +1,5 @@ @import 'variables'; -@import 'red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; .default-table { border-collapse: collapse; diff --git a/apps/red-ui/src/assets/styles/red-text-styles.scss b/apps/red-ui/src/assets/styles/red-text-styles.scss deleted file mode 100644 index 44c49a3c2..000000000 --- a/apps/red-ui/src/assets/styles/red-text-styles.scss +++ /dev/null @@ -1,87 +0,0 @@ -@import 'variables'; -@import 'red-mixins'; - -a { - color: $primary; - transition: color 0.1s; - - &:hover { - color: lighten($primary, 10%); - } - - &.with-underline { - &:hover { - text-decoration: underline; - } - } - - cursor: pointer; -} - -pre { - font-family: Inter, sans-serif; - color: $accent; -} - -.heading-xl { - font-size: 24px; - font-weight: 600; - line-height: 29px; -} - -.info { - font-size: 13px; - line-height: 18px; - opacity: 0.7; -} - -.page-title { - font-size: 13px; - font-weight: 600; - line-height: 18px; - text-align: center; - padding: 0 20px; -} - -.small-label { - opacity: 0.7; - font-size: 11px; - line-height: 14px; - font-weight: initial; -} - -.link-action { - font-size: 11px; - line-height: 14px; - text-decoration: underline; - cursor: pointer; - - &:hover { - text-decoration: none; - } -} - -.large-label { - color: $accent; - font-size: 13px; - line-height: 16px; -} - -.clamp-1 { - @include line-clamp(1); -} - -.clamp-2 { - @include line-clamp(2); -} - -.text-overflow { - display: block !important; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.no-wrap { - white-space: nowrap; -} diff --git a/apps/red-ui/src/assets/styles/red-theme.scss b/apps/red-ui/src/assets/styles/red-theme.scss index 73ba42b37..570d2c455 100644 --- a/apps/red-ui/src/assets/styles/red-theme.scss +++ b/apps/red-ui/src/assets/styles/red-theme.scss @@ -2,7 +2,6 @@ @import '~ngx-toastr/toastr'; @import 'red-material-theme'; @import 'red-page-layout'; -@import 'red-text-styles'; @import 'red-select'; @import 'red-autocomplete'; @import 'red-list'; diff --git a/package.json b/package.json index b9fa0f621..1f6fefdfb 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "format:check": "nx format:check", "format:write": "nx format:write", "help": "nx help", - "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src --output apps/red-ui/src/assets/i18n/en.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write", + "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/en.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write", "postinstall": "ngcc --properties es2015 browser module main", "lint": "nx workspace-lint && nx lint", "lint-fix": "nx workspace-lint --fix && nx lint --fix", diff --git a/paligo-styles/manual-sidebar.scss b/paligo-styles/manual-sidebar.scss index 08c4d61ff..154892057 100644 --- a/paligo-styles/manual-sidebar.scss +++ b/paligo-styles/manual-sidebar.scss @@ -1,5 +1,5 @@ @import '../apps/red-ui/src/assets/styles/variables'; -@import '../apps/red-ui/src/assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; @import 'mixin'; .site-sidebar { diff --git a/paligo-styles/style.scss b/paligo-styles/style.scss index ef0bde074..797687275 100644 --- a/paligo-styles/style.scss +++ b/paligo-styles/style.scss @@ -1,5 +1,5 @@ @import '../apps/red-ui/src/assets/styles/variables'; -@import '../apps/red-ui/src/assets/styles/red-mixins'; +@import 'libs/common-ui/src/assets/styles/mixins'; @import 'fonts'; @import 'header'; @import 'homepage';