From d44b563ed85c0636f24084eb4075979938c92ada Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Tue, 21 Sep 2021 01:25:35 +0300 Subject: [PATCH] wip --- angular.json | 4 ++-- .../user-profile-screen.component.scss | 2 +- ...ttributes-csv-import-dialog.component.scss | 2 +- ...e-attributes-listing-screen.component.scss | 2 +- .../general-config-screen.component.scss | 2 +- .../license-information-screen.component.scss | 2 +- .../reports/reports-screen.component.scss | 2 +- .../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 +- .../search-screen.component.scss | 2 +- .../side-nav/side-nav.component.scss | 2 +- .../upload-status-overlay.component.scss | 2 +- .../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-menu.scss | 2 +- .../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 +- apps/red-ui/src/styles.scss | 20 ++++++++++++++++++- paligo-styles/manual-sidebar.scss | 2 +- paligo-styles/style.scss | 2 +- 27 files changed, 46 insertions(+), 28 deletions(-) diff --git a/angular.json b/angular.json index 77f8b6ea5..ee50cef8c 100644 --- a/angular.json +++ b/angular.json @@ -109,9 +109,9 @@ }, "apps/red-ui/src/manifest.webmanifest" ], - "styles": ["apps/red-ui/src/styles.scss", "libs/common-ui/src/assets/styles/common.scss"], + "styles": ["apps/red-ui/src/styles.scss", "libs/common-ui/src/assets/styles/common-styles.scss"], "stylePreprocessorOptions": { - "includePaths": ["./apps/red-ui/src/assets/styles"] + "includePaths": ["./apps/red-ui/src/assets/styles", "./libs/common-ui/src/assets/styles"] }, "scripts": ["node_modules/@pdftron/webviewer/webviewer.min.js"], "vendorChunk": true, 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 368dd3150..292a6e5c4 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,5 +1,5 @@ @import '../../../assets/styles/variables'; -@import 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../libs/common-ui/src/assets/styles/common-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 8d55816f0..f0975929f 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-mixins'; .sub-header { display: flex; 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 2f729c071..5831de04b 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,4 +1,4 @@ -@import 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-mixins'; :host ::ng-deep iqser-table cdk-virtual-scroll-viewport .cdk-virtual-scroll-content-wrapper .table-item > div.cell { &.center { 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 7edcb0e43..4c55f0e8b 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-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 c8023043a..f70f123bb 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-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 e0bfb001c..bb90d8932 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-mixins'; .content-container, .right-container { 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 11319af19..f5b20cc92 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-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 3d9becd36..fde08cbc3 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 'libs/common-ui/src/assets/styles/texts'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-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 ff0fa3eb8..b1562b2a2 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-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 35e24217b..904b0c0d2 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-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 acfdf0a52..babf015f8 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-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 38c543ba0..24e88f23f 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../../libs/common-ui/src/assets/styles/common-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 de65aecb7..e1ec50df5 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-mixins'; .dialog-content { padding: 0; 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 9d17357bc..fe1d1758e 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-mixins'; @import '../../../../../assets/styles/variables'; :host ::ng-deep iqser-table cdk-virtual-scroll-viewport .cdk-virtual-scroll-content-wrapper .table-item > div.cell { 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 0c3c6579f..3dcac2573 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../../libs/common-ui/src/assets/styles/common-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 bee43a2a5..9c09f803b 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../../../libs/common-ui/src/assets/styles/common-mixins'; .red-upload-download-overlay { background: $white; diff --git a/apps/red-ui/src/assets/styles/red-autocomplete.scss b/apps/red-ui/src/assets/styles/red-autocomplete.scss index c7c1f171e..847b98a32 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../libs/common-ui/src/assets/styles/common-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 b82e18960..06ff34bf5 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../libs/common-ui/src/assets/styles/common-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 9a29adaa0..50f13ea60 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../libs/common-ui/src/assets/styles/common-mixins'; .oval, .square { diff --git a/apps/red-ui/src/assets/styles/red-menu.scss b/apps/red-ui/src/assets/styles/red-menu.scss index 89603ebde..dc3120dfb 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../libs/common-ui/src/assets/styles/common-mixins'; .mat-menu-panel { border-radius: 8px !important; 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 7e0a58eb2..286468764 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../libs/common-ui/src/assets/styles/common-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 b2a8ba192..c8ac24b20 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../libs/common-ui/src/assets/styles/common-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 1495547af..de51eaf8d 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../../../../../libs/common-ui/src/assets/styles/common-mixins'; .default-table { border-collapse: collapse; diff --git a/apps/red-ui/src/styles.scss b/apps/red-ui/src/styles.scss index 2b4844453..e7b2a0611 100644 --- a/apps/red-ui/src/styles.scss +++ b/apps/red-ui/src/styles.scss @@ -1,2 +1,20 @@ /* You can add global styles to this file, and also import other style files */ -@import 'assets/styles/red-theme'; +@use 'variables' as vars; +@use '../../../libs/common-ui/src/assets/styles/common-variables'; +@use 'assets/styles/red-theme'; + +@include common-variables.configure( + $iqser-primary: vars.$primary, + $iqser-primary-2: vars.$primary-2, + $iqser-accent: vars.$accent, + $iqser-disabled: vars.$grey-7, + $iqser-not-disabled-table-item: vars.$grey-8, + $iqser-btn-bg-hover: vars.$btn-bg-hover, + $iqser-btn-bg: vars.$btn-bg, + $iqser-warn: vars.$warn, + $iqser-white: vars.$white, + $iqser-separator: vars.$separator, + $iqser-quick-filter-border: vars.$quick-filter-border, + $iqser-filter-bg: vars.$filter-bg, + $iqser-helpmode-primary: vars.$green-2 +); diff --git a/paligo-styles/manual-sidebar.scss b/paligo-styles/manual-sidebar.scss index 154892057..753614a84 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 'libs/common-ui/src/assets/styles/mixins'; +@import '../libs/common-ui/src/assets/styles/common-mixins'; @import 'mixin'; .site-sidebar { diff --git a/paligo-styles/style.scss b/paligo-styles/style.scss index f2b0b21b1..47caa0fa1 100644 --- a/paligo-styles/style.scss +++ b/paligo-styles/style.scss @@ -1,5 +1,5 @@ @import 'apps/red-ui/src/assets/styles/variables'; -@import 'libs/common-ui/src/assets/styles/mixins'; +@import '../libs/common-ui/src/assets/styles/common-mixins'; @import 'fonts'; @import 'header'; @import 'homepage';