diff --git a/demo-shell/src/app/components/about/about.component.ts b/demo-shell/src/app/components/about/about.component.ts index 09105d771e..f55f3972aa 100644 --- a/demo-shell/src/app/components/about/about.component.ts +++ b/demo-shell/src/app/components/about/about.component.ts @@ -27,7 +27,7 @@ import { AppConfigService } from '@alfresco/adf-core'; @Component({ selector: 'app-about-page', templateUrl: './about.component.html', - styleUrls: ['about.component.scss'] + styleUrls: ['./about.component.scss'] }) export class AboutComponent implements OnInit { url = `https://github.com/Alfresco/${name}/commits/${commit}`; diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.scss b/demo-shell/src/app/components/app-layout/app-layout.component.scss index 9e3c8440b8..49960db1e4 100644 --- a/demo-shell/src/app/components/app-layout/app-layout.component.scss +++ b/demo-shell/src/app/components/app-layout/app-layout.component.scss @@ -2,7 +2,7 @@ $primary: map-get($theme, primary); $minimumAppWidth: 320px; - @media screen and ($mat-xsmall) { + @media screen and (max-width: 599px) { app-search-bar { width: 150px; } @@ -46,13 +46,13 @@ } } - @media screen and ($mat-small) { + @media screen and (max-width: 959px) { .app-menu { padding-top: 0; } } - @media screen and ($mat-xsmall) {} + @media screen and (max-width: 599px) {} mat-sidenav-content > div { display: flex; diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.ts b/demo-shell/src/app/components/app-layout/app-layout.component.ts index 4084b4ce08..316656ceab 100644 --- a/demo-shell/src/app/components/app-layout/app-layout.component.ts +++ b/demo-shell/src/app/components/app-layout/app-layout.component.ts @@ -22,8 +22,7 @@ import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; @Component({ - templateUrl: 'app-layout.component.html', - styleUrls: ['app-layout.component.scss'], + templateUrl: './app-layout.component.html', host: { 'class': 'app-layout' }, diff --git a/demo-shell/src/app/components/app-layout/cloud/form-demo/cloud-form-demo.component.ts b/demo-shell/src/app/components/app-layout/cloud/form-demo/cloud-form-demo.component.ts index 0f890812cf..13e8843a6a 100644 --- a/demo-shell/src/app/components/app-layout/cloud/form-demo/cloud-form-demo.component.ts +++ b/demo-shell/src/app/components/app-layout/cloud/form-demo/cloud-form-demo.component.ts @@ -34,8 +34,8 @@ import { } from '../../../cloud/custom-form-components/custom-editor.component'; @Component({ - templateUrl: 'cloud-form-demo.component.html', - styleUrls: ['cloud-form-demo.component.scss'], + templateUrl: './cloud-form-demo.component.html', + styleUrls: ['./cloud-form-demo.component.scss'], providers: [ { provide: FormRenderingService, useClass: CloudFormRenderingService } ] diff --git a/demo-shell/src/app/components/aspect-list-sample/aspect-list-sample.component.ts b/demo-shell/src/app/components/aspect-list-sample/aspect-list-sample.component.ts index 3b8c2b56eb..e9f08a2d44 100644 --- a/demo-shell/src/app/components/aspect-list-sample/aspect-list-sample.component.ts +++ b/demo-shell/src/app/components/aspect-list-sample/aspect-list-sample.component.ts @@ -20,8 +20,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-expandable-menu', - templateUrl: 'aspect-list-sample.component.html', - styleUrls: ['aspect-list-sample.component.scss'] + templateUrl: './aspect-list-sample.component.html', + styleUrls: ['./aspect-list-sample.component.scss'] }) export class AspectListSampleComponent { diff --git a/demo-shell/src/app/components/cloud/cloud-breadcrumb-component.ts b/demo-shell/src/app/components/cloud/cloud-breadcrumb-component.ts index 90816e16bd..f932b77160 100644 --- a/demo-shell/src/app/components/cloud/cloud-breadcrumb-component.ts +++ b/demo-shell/src/app/components/cloud/cloud-breadcrumb-component.ts @@ -21,7 +21,7 @@ import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'app-cloud-breadcrumbs', templateUrl: './cloud-breadcrumb-component.html', - styleUrls: ['cloud-breadcrumb-component.scss'] + styleUrls: ['./cloud-breadcrumb-component.scss'] }) export class CloudBreadcrumbsComponent implements OnInit { appName: string; diff --git a/demo-shell/src/app/components/cloud/cloud-filters-demo.component.ts b/demo-shell/src/app/components/cloud/cloud-filters-demo.component.ts index a8f0050b42..9e8bb3d277 100644 --- a/demo-shell/src/app/components/cloud/cloud-filters-demo.component.ts +++ b/demo-shell/src/app/components/cloud/cloud-filters-demo.component.ts @@ -24,7 +24,7 @@ import { ProcessFilterCloudModel } from '@alfresco/adf-process-services-cloud'; @Component({ selector: 'app-cloud-filters-demo', templateUrl: './cloud-filters-demo.component.html', - styleUrls: ['cloud-filters-demo.component.scss'], + styleUrls: ['./cloud-filters-demo.component.scss'], encapsulation: ViewEncapsulation.None }) export class CloudFiltersDemoComponent implements OnInit { diff --git a/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.ts b/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.ts index 5063c9d2db..b4570bb9d7 100644 --- a/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.ts +++ b/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.ts @@ -23,7 +23,7 @@ import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; @Component({ - templateUrl: 'service-task-list-cloud-demo.component.html' + templateUrl: './service-task-list-cloud-demo.component.html' }) export class ServiceTaskListCloudDemoComponent implements OnInit, OnDestroy { diff --git a/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.scss b/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts b/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts index 84336c708a..0e47c89ba0 100644 --- a/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts +++ b/demo-shell/src/app/components/cloud/start-process-cloud-demo.component.ts @@ -24,7 +24,6 @@ import { CloudFormRenderingService } from '@alfresco/adf-process-services-cloud' @Component({ templateUrl: './start-process-cloud-demo.component.html', - styleUrls: ['./start-process-cloud-demo.component.scss'], providers: [ { provide: FormRenderingService, useClass: CloudFormRenderingService } ] diff --git a/demo-shell/src/app/components/cloud/start-task-cloud-demo.component.scss b/demo-shell/src/app/components/cloud/start-task-cloud-demo.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/demo-shell/src/app/components/cloud/start-task-cloud-demo.component.ts b/demo-shell/src/app/components/cloud/start-task-cloud-demo.component.ts index 25abc786ff..cd7f94422e 100644 --- a/demo-shell/src/app/components/cloud/start-task-cloud-demo.component.ts +++ b/demo-shell/src/app/components/cloud/start-task-cloud-demo.component.ts @@ -21,8 +21,7 @@ import { NotificationService } from '@alfresco/adf-core'; import { CloudLayoutService } from './services/cloud-layout.service'; @Component({ - templateUrl: './start-task-cloud-demo.component.html', - styleUrls: ['./start-task-cloud-demo.component.scss'] + templateUrl: './start-task-cloud-demo.component.html' }) export class StartTaskCloudDemoComponent implements OnInit { diff --git a/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.scss b/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.ts b/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.ts index 2fccfa7bbb..ec77393372 100644 --- a/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.ts +++ b/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.ts @@ -24,8 +24,7 @@ import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; @Component({ - templateUrl: 'tasks-cloud-demo.component.html', - styleUrls: ['tasks-cloud-demo.component.scss'] + templateUrl: './tasks-cloud-demo.component.html' }) export class TasksCloudDemoComponent implements OnInit, OnDestroy { diff --git a/demo-shell/src/app/components/config-editor/config-editor.component.ts b/demo-shell/src/app/components/config-editor/config-editor.component.ts index 32bcc6d893..1572f4e2c5 100644 --- a/demo-shell/src/app/components/config-editor/config-editor.component.ts +++ b/demo-shell/src/app/components/config-editor/config-editor.component.ts @@ -27,7 +27,7 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'app-config-editor', - templateUrl: 'config-editor.component.html', + templateUrl: './config-editor.component.html', styleUrls: ['./config-editor.component.scss'] }) export class ConfigEditorComponent implements OnDestroy { diff --git a/demo-shell/src/app/components/confirm-dialog/confirm-dialog-example.component.scss b/demo-shell/src/app/components/confirm-dialog/confirm-dialog-example.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/demo-shell/src/app/components/confirm-dialog/confirm-dialog-example.component.ts b/demo-shell/src/app/components/confirm-dialog/confirm-dialog-example.component.ts index 9092606d0c..15d2f094b1 100644 --- a/demo-shell/src/app/components/confirm-dialog/confirm-dialog-example.component.ts +++ b/demo-shell/src/app/components/confirm-dialog/confirm-dialog-example.component.ts @@ -21,8 +21,7 @@ import { ConfirmDialogComponent } from '@alfresco/adf-content-services'; @Component({ selector: 'app-confirm-dialog-example', - templateUrl: 'confirm-dialog-example.component.html', - styleUrls: ['confirm-dialog-example.component.scss'] + templateUrl: './confirm-dialog-example.component.html' }) export class ConfirmDialogExampleComponent { diff --git a/demo-shell/src/app/components/file-view/file-view.component.ts b/demo-shell/src/app/components/file-view/file-view.component.ts index b18904941e..733fc4a494 100644 --- a/demo-shell/src/app/components/file-view/file-view.component.ts +++ b/demo-shell/src/app/components/file-view/file-view.component.ts @@ -23,8 +23,8 @@ import { PreviewService } from '../../services/preview.service'; @Component({ selector: 'app-file-view', - templateUrl: 'file-view.component.html', - styleUrls: ['file-view.component.scss'], + templateUrl: './file-view.component.html', + styleUrls: ['./file-view.component.scss'], encapsulation: ViewEncapsulation.None }) export class FileViewComponent implements OnInit { diff --git a/demo-shell/src/app/components/files/custom-sources.component.ts b/demo-shell/src/app/components/files/custom-sources.component.ts index 538f962a4b..bae5e7cee8 100644 --- a/demo-shell/src/app/components/files/custom-sources.component.ts +++ b/demo-shell/src/app/components/files/custom-sources.component.ts @@ -20,7 +20,7 @@ import { DocumentListComponent } from '@alfresco/adf-content-services'; @Component({ selector: 'app-custom-sources', - templateUrl: 'custom-sources.component.html' + templateUrl: './custom-sources.component.html' }) export class CustomSourcesComponent { diff --git a/demo-shell/src/app/components/files/files.component.scss b/demo-shell/src/app/components/files/files.component.scss index db5b54b3fa..54ddc4778e 100644 --- a/demo-shell/src/app/components/files/files.component.scss +++ b/demo-shell/src/app/components/files/files.component.scss @@ -3,7 +3,7 @@ margin: 10px !important; } - @media screen and ($mat-xsmall) { + @media screen and (max-width: 599px) { .app-container { margin: 0; } diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts index 36053f38db..b4a67901c1 100644 --- a/demo-shell/src/app/components/files/files.component.ts +++ b/demo-shell/src/app/components/files/files.component.ts @@ -54,7 +54,6 @@ const DEFAULT_FOLDER_TO_SHOW = '-my-'; @Component({ selector: 'app-files-component', templateUrl: './files.component.html', - styleUrls: ['./files.component.scss'], providers: [ { provide: FormRenderingService, useClass: ProcessFormRenderingService } ] diff --git a/demo-shell/src/app/components/form/form-list.component.ts b/demo-shell/src/app/components/form/form-list.component.ts index bf4e2934ef..99b0840163 100644 --- a/demo-shell/src/app/components/form/form-list.component.ts +++ b/demo-shell/src/app/components/form/form-list.component.ts @@ -23,8 +23,8 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'app-form-list', - templateUrl: 'form-list.component.html', - styleUrls: ['form-list.component.scss'] + templateUrl: './form-list.component.html', + styleUrls: ['./form-list.component.scss'] }) export class FormListComponent implements OnInit, OnDestroy { diff --git a/demo-shell/src/app/components/form/form-loading.component.ts b/demo-shell/src/app/components/form/form-loading.component.ts index 42e4227a8c..58d4cbcee7 100644 --- a/demo-shell/src/app/components/form/form-loading.component.ts +++ b/demo-shell/src/app/components/form/form-loading.component.ts @@ -29,8 +29,8 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'app-form-loading', - templateUrl: 'form-loading.component.html', - styleUrls: ['form-loading.component.scss'], + templateUrl: './form-loading.component.html', + styleUrls: ['./form-loading.component.scss'], providers: [{ provide: FormService, useClass: FakeFormService }] }) export class FormLoadingComponent implements OnInit, OnDestroy { diff --git a/demo-shell/src/app/components/form/form.component.ts b/demo-shell/src/app/components/form/form.component.ts index f7df6ac80b..5909e96195 100644 --- a/demo-shell/src/app/components/form/form.component.ts +++ b/demo-shell/src/app/components/form/form.component.ts @@ -24,8 +24,8 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'app-form', - templateUrl: 'form.component.html', - styleUrls: ['form.component.scss'], + templateUrl: './form.component.html', + styleUrls: ['./form.component.scss'], providers: [ { provide: FormService, useClass: InMemoryFormService }, { provide: FormRenderingService, useClass: ProcessFormRenderingService } diff --git a/demo-shell/src/app/components/login/login.component.scss b/demo-shell/src/app/components/login/login.component.scss index 7d17c6a730..f0cd6b87c8 100644 --- a/demo-shell/src/app/components/login/login.component.scss +++ b/demo-shell/src/app/components/login/login.component.scss @@ -26,7 +26,7 @@ display: none; } - @media screen and ($mat-small) { + @media screen and (max-width: 959px) { .app-settings, .app-setting-button.mat-fab.mat-accent { display: none; } diff --git a/demo-shell/src/app/components/login/login.component.ts b/demo-shell/src/app/components/login/login.component.ts index 1e67052a8f..0ed5776767 100644 --- a/demo-shell/src/app/components/login/login.component.ts +++ b/demo-shell/src/app/components/login/login.component.ts @@ -21,8 +21,7 @@ import { LogService } from '@alfresco/adf-core'; @Component({ selector: 'app-login', - templateUrl: './login.component.html', - styleUrls: ['./login.component.scss'] + templateUrl: './login.component.html' }) export class LoginComponent { diff --git a/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.ts b/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.ts index f283a7a79c..fe8eb1a272 100644 --- a/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.ts +++ b/demo-shell/src/app/components/overlay-viewer/overlay-viewer.component.ts @@ -18,7 +18,7 @@ import { Component, Input } from '@angular/core'; @Component({ - templateUrl: 'overlay-viewer.component.html' + templateUrl: './overlay-viewer.component.html' }) export class OverlayViewerComponent { diff --git a/demo-shell/src/app/components/pipes/pipes.component.ts b/demo-shell/src/app/components/pipes/pipes.component.ts index 5d10e99419..2c9a672189 100644 --- a/demo-shell/src/app/components/pipes/pipes.component.ts +++ b/demo-shell/src/app/components/pipes/pipes.component.ts @@ -21,7 +21,7 @@ import { AppConfigService } from '@alfresco/adf-core'; @Component({ selector: 'app-pipes-page', templateUrl: './pipes.component.html', - styleUrls: ['pipes.component.scss'] + styleUrls: ['./pipes.component.scss'] }) export class PipesComponent { diff --git a/demo-shell/src/app/components/process-service/process-service.component.scss b/demo-shell/src/app/components/process-service/process-service.component.scss index a5de374bcf..f6e95a3a7b 100644 --- a/demo-shell/src/app/components/process-service/process-service.component.scss +++ b/demo-shell/src/app/components/process-service/process-service.component.scss @@ -1,100 +1,97 @@ -@mixin app-process-service-component-theme($theme) { - .app-no-form-container { - text-align: center; - font-weight: 600; - font-size: 18px; +.app-no-form-container { + text-align: center; + font-weight: 600; + font-size: 18px; +} + +.app-grid { + .app-grid-item { + margin: 4px; + box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), + 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + padding: 10px; } - .app-grid { - .app-grid-item { - margin: 4px; - box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), - 0 3px 1px -2px rgba(0, 0, 0, 0.2), - 0 1px 5px 0 rgba(0, 0, 0, 0.12); - padding: 10px; - } + .app-list-buttons { + margin-bottom: 24px; + } - .app-list-buttons { - margin-bottom: 24px; - } + .app-tasks-list.app-small-pagination, + .app-processes-list.app-small-pagination { + .app-pagination { + flex-wrap: wrap; + padding-bottom: 24px; + padding-top: 8px; - .app-tasks-list.app-small-pagination, - .app-processes-list.app-small-pagination { - .app-pagination { - - flex-wrap: wrap; - padding-bottom: 24px; - padding-top: 8px; - - &__range-block.app-pagination__block:first-child { - order: 1; - width: 60%; - flex: 0 0 auto; - box-sizing: border-box; - padding-left: 2px; - justify-content: flex-start; - } - - &__perpage-block { - order: 3; - width: 60%; - box-sizing: border-box; - padding-left: 2px; - justify-content: flex-start; - } - - &__actualinfo-block { - order: 2; - width: 40%; - box-sizing: border-box; - padding-right: 2px; - justify-content: flex-end; - } - - &__controls-block { - order: 4; - width: 40%; - box-sizing: border-box; - padding-right: 2px; - justify-content: flex-end; - } + &__range-block.app-pagination__block:first-child { + order: 1; + width: 60%; + flex: 0 0 auto; + box-sizing: border-box; + padding-left: 2px; + justify-content: flex-start; } - } - .app-list { - .app-datatable-list { - border: none; + &__perpage-block { + order: 3; + width: 60%; + box-sizing: border-box; + padding-left: 2px; + justify-content: flex-start; } - } - mat-slide-toggle { - margin: 10px; - } + &__actualinfo-block { + order: 2; + width: 40%; + box-sizing: border-box; + padding-right: 2px; + justify-content: flex-end; + } - @media screen and ($mat-small) { - container-widget .app-grid-list { - flex-direction: column; + &__controls-block { + order: 4; + width: 40%; + box-sizing: border-box; + padding-right: 2px; + justify-content: flex-end; } } } - .app-accordion-panel { - .mat-expansion-panel { - background: inherit; + .app-list { + .app-datatable-list { + border: none; } + } - .mat-expansion-panel-header-title, .mat-expansion-panel-header-description { - flex-basis: 0; - align-items: center; - } + mat-slide-toggle { + margin: 10px; + } - .mat-expansion-panel-header-description { - justify-content: space-between; - align-items: center; - } - - .app-accordion-title-padding { - padding-left: 20px; + @media screen and (max-width: 959px) { + container-widget .app-grid-list { + flex-direction: column; } } } + +.app-accordion-panel { + .mat-expansion-panel { + background: inherit; + } + + .mat-expansion-panel-header-title, + .mat-expansion-panel-header-description { + flex-basis: 0; + align-items: center; + } + + .mat-expansion-panel-header-description { + justify-content: space-between; + align-items: center; + } + + .app-accordion-title-padding { + padding-left: 20px; + } +} diff --git a/demo-shell/src/app/components/settings/settings.component.ts b/demo-shell/src/app/components/settings/settings.component.ts index 29bcae96c4..137caf0779 100644 --- a/demo-shell/src/app/components/settings/settings.component.ts +++ b/demo-shell/src/app/components/settings/settings.component.ts @@ -21,7 +21,7 @@ import { Router } from '@angular/router'; @Component({ selector: 'app-settings', - templateUrl: 'settings.component.html' + templateUrl: './settings.component.html' }) export class SettingsComponent { diff --git a/demo-shell/src/app/components/shared-link-view/shared-link-view.component.ts b/demo-shell/src/app/components/shared-link-view/shared-link-view.component.ts index 0fe1557ee6..81a63f98c3 100644 --- a/demo-shell/src/app/components/shared-link-view/shared-link-view.component.ts +++ b/demo-shell/src/app/components/shared-link-view/shared-link-view.component.ts @@ -20,8 +20,8 @@ import { ActivatedRoute, Router } from '@angular/router'; @Component({ selector: 'app-shared-link-view', - templateUrl: 'shared-link-view.component.html', - styleUrls: [ 'shared-link-view.component.scss' ], + templateUrl: './shared-link-view.component.html', + styleUrls: [ './shared-link-view.component.scss' ], encapsulation: ViewEncapsulation.None, // tslint:disable-next-line:use-host-property-decorator host: { 'class': 'app-shared-link-view' } diff --git a/demo-shell/src/app/components/sites/sites.component.scss b/demo-shell/src/app/components/sites/sites.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/demo-shell/src/app/components/sites/sites.component.ts b/demo-shell/src/app/components/sites/sites.component.ts index 5693a4670d..7f2ba532ee 100644 --- a/demo-shell/src/app/components/sites/sites.component.ts +++ b/demo-shell/src/app/components/sites/sites.component.ts @@ -19,8 +19,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-sites', - templateUrl: 'sites.component.html', - styleUrls: ['sites.component.scss'] + templateUrl: './sites.component.html' }) export class SitesComponent { diff --git a/demo-shell/src/app/components/social/social.component.ts b/demo-shell/src/app/components/social/social.component.ts index 3f6db6e688..e51a3219aa 100644 --- a/demo-shell/src/app/components/social/social.component.ts +++ b/demo-shell/src/app/components/social/social.component.ts @@ -19,8 +19,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-social', - templateUrl: 'social.component.html', - styleUrls: ['social.component.scss'] + templateUrl: './social.component.html', + styleUrls: ['./social.component.scss'] }) export class SocialComponent { diff --git a/demo-shell/src/app/components/tag/tag.component.ts b/demo-shell/src/app/components/tag/tag.component.ts index 6026a14fa9..b96112e7a8 100644 --- a/demo-shell/src/app/components/tag/tag.component.ts +++ b/demo-shell/src/app/components/tag/tag.component.ts @@ -19,8 +19,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-tag', - templateUrl: 'tag.component.html', - styleUrls: ['tag.component.scss'] + templateUrl: './tag.component.html', + styleUrls: ['./tag.component.scss'] }) export class TagComponent { diff --git a/demo-shell/src/app/components/theme-picker/theme-picker.ts b/demo-shell/src/app/components/theme-picker/theme-picker.ts index ddc2d7c13b..a18adbb4ed 100644 --- a/demo-shell/src/app/components/theme-picker/theme-picker.ts +++ b/demo-shell/src/app/components/theme-picker/theme-picker.ts @@ -28,8 +28,8 @@ import { DocsSiteTheme, ThemeStorage } from './theme-storage/theme-storage'; @Component({ selector: 'app-theme-picker', - templateUrl: 'theme-picker.html', - styleUrls: ['theme-picker.css'], + templateUrl: './theme-picker.html', + styleUrls: ['./theme-picker.css'], changeDetection: ChangeDetectionStrategy.OnPush, host: {'aria-hidden': 'true'} }) diff --git a/demo-shell/src/app/components/trashcan/trashcan.component.scss b/demo-shell/src/app/components/trashcan/trashcan.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/demo-shell/src/app/components/trashcan/trashcan.component.ts b/demo-shell/src/app/components/trashcan/trashcan.component.ts index 4b609cd03b..763367b1eb 100644 --- a/demo-shell/src/app/components/trashcan/trashcan.component.ts +++ b/demo-shell/src/app/components/trashcan/trashcan.component.ts @@ -24,8 +24,7 @@ import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; @Component({ - templateUrl: './trashcan.component.html', - styleUrls: ['trashcan.component.scss'] + templateUrl: './trashcan.component.html' }) export class TrashcanComponent implements OnInit, OnDestroy { @ViewChild('documentList', { static: true }) diff --git a/demo-shell/src/app/components/tree-view/tree-view-sample.component.ts b/demo-shell/src/app/components/tree-view/tree-view-sample.component.ts index 38506a09d0..879720a511 100644 --- a/demo-shell/src/app/components/tree-view/tree-view-sample.component.ts +++ b/demo-shell/src/app/components/tree-view/tree-view-sample.component.ts @@ -19,8 +19,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-tree-view', - templateUrl: 'tree-view-sample.component.html', - styleUrls: ['tree-view-sample.component.scss'] + templateUrl: './tree-view-sample.component.html', + styleUrls: ['./tree-view-sample.component.scss'] }) export class TreeViewSampleComponent { diff --git a/demo-shell/src/app/components/webscript/webscript.component.ts b/demo-shell/src/app/components/webscript/webscript.component.ts index fa15104e21..af516f11d3 100644 --- a/demo-shell/src/app/components/webscript/webscript.component.ts +++ b/demo-shell/src/app/components/webscript/webscript.component.ts @@ -20,7 +20,7 @@ import { LogService } from '@alfresco/adf-core'; @Component({ selector: 'app-webscript', - templateUrl: 'webscript.component.html' + templateUrl: './webscript.component.html' }) export class WebscriptComponent { diff --git a/demo-shell/src/custom-style-dev.scss b/demo-shell/src/custom-style-dev.scss index 9d81eaca74..50c9d67ac7 100644 --- a/demo-shell/src/custom-style-dev.scss +++ b/demo-shell/src/custom-style-dev.scss @@ -1,7 +1,6 @@ @import './app/components/app-layout/app-layout.component.scss'; @import './app/components/files/files.component.scss'; @import './app/components/login/login.component.scss'; -@import './app/components/process-service/process-service.component.scss'; @import '../../lib/content-services/src/lib/styles/index'; @@ -23,7 +22,6 @@ $theme: mat-light-theme($primary, $accent, $warn); @include app-layout-theme($theme); @include app-file-component-theme($theme); @include app-login-component-theme($theme); -@include app-process-service-component-theme($theme); @include adf-content-services-theme($theme); diff --git a/demo-shell/src/custom-style.scss b/demo-shell/src/custom-style.scss index dc982d918b..f915567db1 100644 --- a/demo-shell/src/custom-style.scss +++ b/demo-shell/src/custom-style.scss @@ -1,7 +1,6 @@ @import './app/components/app-layout/app-layout.component.scss'; @import './app/components/files/files.component.scss'; @import './app/components/login/login.component.scss'; -@import './app/components/process-service/process-service.component.scss'; @import '~@alfresco/adf-content-services/theming'; @import '~@alfresco/adf-process-services/theming'; @@ -22,7 +21,6 @@ $theme: mat-light-theme($primary, $accent, $warn); @include app-layout-theme($theme); @include app-file-component-theme($theme); @include app-login-component-theme($theme); -@include app-process-service-component-theme($theme); @include adf-content-services-theme($theme); @include adf-process-services-theme($theme); diff --git a/lib/cli/package-lock.json b/lib/cli/package-lock.json index a3367a66c6..6fc712d366 100644 --- a/lib/cli/package-lock.json +++ b/lib/cli/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@alfresco/js-api": { - "version": "4.4.0-3493", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.4.0-3493.tgz", - "integrity": "sha512-O8qCJXSeL0S4/3VbCkAwDgeCCr4nQ4WqmpaLIU6YUGvO0AcPLYatKFoEuHlgCyex6gzRaYMQhoi1PhX/7cmQIg==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.4.0.tgz", + "integrity": "sha512-TLBXPc01Hi23gOCkkQy2p9lcBZgcCsymOkRPG0exclDaQnpgWBPFn0e+ykm7WA51hHusgZC2sUoZv1Y95nq6MA==", "requires": { "event-emitter": "^0.3.5", "minimatch": "3.0.4", diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss index 5a012d05b3..f24ec5004c 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss +++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss @@ -1,55 +1,40 @@ -@mixin adf-aspect-list-dialog-theme($theme) { - $primary: map-get($theme, primary); - $accent: map-get($theme, accent); - $warn: map-get($theme, warn); - $foreground: map-get($theme, foreground); - $background: map-get($theme, background); - - - .adf { - - &-aspect-list-dialog-title { - font-size: large; - font-weight: 200; - margin-top: 0; - } - - &-aspect-list-dialog-description { - font-size: small; - line-height: normal; - } - - &-aspect-list-dialog-information { - display: flex; - justify-content: space-between; - padding-left: 5px; - padding-right: 5px; - font-size: small; - } - - &-aspect-list-dialog { - .mat-dialog-actions { - justify-content: space-between; - } - } - - &-aspect-dialog-content { - padding-top: 3px; - - .adf-aspect-property-table { - - .mat-cell { - font-size: smaller; - } - - .mat-column-name { - width: 30%; - } - } - } - - +.adf { + &-aspect-list-dialog-title { + font-size: large; + font-weight: 200; + margin-top: 0; } + &-aspect-list-dialog-description { + font-size: small; + line-height: normal; + } + &-aspect-list-dialog-information { + display: flex; + justify-content: space-between; + padding-left: 5px; + padding-right: 5px; + font-size: small; + } + + &-aspect-list-dialog { + .mat-dialog-actions { + justify-content: space-between; + } + } + + &-aspect-dialog-content { + padding-top: 3px; + + .adf-aspect-property-table { + .mat-cell { + font-size: smaller; + } + + .mat-column-name { + width: 30%; + } + } + } } diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.scss b/lib/content-services/src/lib/aspect-list/aspect-list.component.scss index cf5ad3da50..dffa218ab5 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list.component.scss +++ b/lib/content-services/src/lib/aspect-list/aspect-list.component.scss @@ -1,10 +1,5 @@ @mixin adf-aspect-list-theme($theme) { - - $primary: map-get($theme, primary); - $accent: map-get($theme, accent); - $warn: map-get($theme, warn); $foreground: map-get($theme, foreground); - $background: map-get($theme, background); .adf { diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.ts b/lib/content-services/src/lib/aspect-list/aspect-list.component.ts index 50d7dfb02b..71cd3b06f3 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list.component.ts +++ b/lib/content-services/src/lib/aspect-list/aspect-list.component.ts @@ -25,7 +25,6 @@ import { AspectEntry } from '@alfresco/js-api'; @Component({ selector: 'adf-aspect-list', templateUrl: './aspect-list.component.html', - styleUrls: ['./aspect-list.component.scss'], encapsulation: ViewEncapsulation.None }) diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss index e7b4d78478..ca5f36492c 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.scss @@ -3,7 +3,6 @@ $accent: map-get($theme, accent); $warn: map-get($theme, warn); $foreground: map-get($theme, foreground); - $background: map-get($theme, background); $breadcrumb-chevron-spacer: 2px; $breadcrumb-outline: 1px solid mat-color($alfresco-ecm-blue, A200) !default; diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts index 1a55097d08..497135b13b 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts @@ -35,7 +35,6 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'adf-breadcrumb', templateUrl: './breadcrumb.component.html', - styleUrls: ['./breadcrumb.component.scss'], encapsulation: ViewEncapsulation.None, host: { 'class': 'adf-breadcrumb' diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts index a16f6d3e62..f8bd2db8ff 100644 --- a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts +++ b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts @@ -23,7 +23,6 @@ import { BreadcrumbComponent } from './breadcrumb.component'; @Component({ selector: 'adf-dropdown-breadcrumb', templateUrl: './dropdown-breadcrumb.component.html', - styleUrls: ['./dropdown-breadcrumb.component.scss'], encapsulation: ViewEncapsulation.None, host: { 'class': 'adf-dropdown-breadcrumb' diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.scss b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.scss index d302c07c5d..00ac5f29b6 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.scss +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.scss @@ -1,6 +1,4 @@ @mixin adf-content-metadata-card-theme($theme) { - $primary: map-get($theme, primary); - $background: map-get($theme, background); $foreground: map-get($theme, foreground); .adf-content-metadata-card { diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts index 78acf4e501..bc0682c7fc 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts @@ -22,7 +22,6 @@ import { NodeAspectService } from '../../../aspect-list/node-aspect.service'; @Component({ selector: 'adf-content-metadata-card', templateUrl: './content-metadata-card.component.html', - styleUrls: ['./content-metadata-card.component.scss'], encapsulation: ViewEncapsulation.None, host: { 'class': 'adf-content-metadata-card' } }) diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts index 2fdbb64afe..e2570ef5d0 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts @@ -36,7 +36,6 @@ import { takeUntil, debounceTime, catchError, map } from 'rxjs/operators'; @Component({ selector: 'adf-content-metadata', templateUrl: './content-metadata.component.html', - styleUrls: ['./content-metadata.component.scss'], host: { 'class': 'adf-content-metadata' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss index 564c3fe6c3..f8745820e3 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss @@ -1,7 +1,6 @@ @mixin adf-content-node-selector-theme($theme) { $primary: map-get($theme, primary); $foreground: map-get($theme, foreground); - $background: map-get($theme, background); $content-node-selector-thumbnail-width: 35px !default; .adf-search-results-label { diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts index ea9283ded2..9146800241 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts @@ -58,7 +58,6 @@ export const defaultValidation = () => true; @Component({ selector: 'adf-content-node-selector-panel', - styleUrls: ['./content-node-selector-panel.component.scss'], templateUrl: './content-node-selector-panel.component.html', encapsulation: ViewEncapsulation.None, host: { 'class': 'adf-content-node-selector-panel' }, diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts index 9ecfe725bb..12f29ab5d5 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts @@ -27,7 +27,6 @@ import { NodeAction } from '../document-list/models/node-action.enum'; @Component({ selector: 'adf-content-node-selector', templateUrl: './content-node-selector.component.html', - styleUrls: ['./content-node-selector.component.scss'], encapsulation: ViewEncapsulation.None }) export class ContentNodeSelectorComponent implements OnInit { diff --git a/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.ts b/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.ts index 2fdc6850a9..c9e0610f64 100644 --- a/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.ts +++ b/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.ts @@ -24,7 +24,6 @@ import { DataRow } from '@alfresco/adf-core';
{{ name }}
{{ path }}
`, - styleUrls: ['./name-location-cell.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, host: { class: 'adf-name-location-cell adf-datatable-content-cell' } diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts index 831cbce4d6..0cc82735b9 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts @@ -45,7 +45,6 @@ type DatePickerType = 'date' | 'time' | 'month' | 'datetime'; @Component({ selector: 'adf-share-dialog', templateUrl: './content-node-share.dialog.html', - styleUrls: ['./content-node-share.dialog.scss'], host: { class: 'adf-share-dialog' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/content-services/src/lib/content-type/content-type-dialog.component.scss b/lib/content-services/src/lib/content-type/content-type-dialog.component.scss index cb22bfc82f..90da676ebe 100644 --- a/lib/content-services/src/lib/content-type/content-type-dialog.component.scss +++ b/lib/content-services/src/lib/content-type/content-type-dialog.component.scss @@ -1,10 +1,5 @@ @mixin adf-content-type-dialog-theme($theme) { $primary: map-get($theme, primary); - $accent: map-get($theme, accent); - $warn: map-get($theme, warn); - $foreground: map-get($theme, foreground); - $background: map-get($theme, background); - .adf { diff --git a/lib/content-services/src/lib/content-type/content-type-dialog.component.ts b/lib/content-services/src/lib/content-type/content-type-dialog.component.ts index e12b970ef6..5f0362298f 100644 --- a/lib/content-services/src/lib/content-type/content-type-dialog.component.ts +++ b/lib/content-services/src/lib/content-type/content-type-dialog.component.ts @@ -24,7 +24,6 @@ import { ContentTypeService } from './content-type.service'; @Component({ selector: 'adf-content-type-dialog', templateUrl: './content-type-dialog.component.html', - styleUrls: ['./content-type-dialog.component.scss'], encapsulation: ViewEncapsulation.None }) export class ContentTypeDialogComponent implements OnInit { diff --git a/lib/content-services/src/lib/dialogs/folder.dialog.scss b/lib/content-services/src/lib/dialogs/folder.dialog.scss index dd776baa3b..f0411fddb7 100644 --- a/lib/content-services/src/lib/dialogs/folder.dialog.scss +++ b/lib/content-services/src/lib/dialogs/folder.dialog.scss @@ -1,31 +1,31 @@ -.adf-fill-remaining-space { - flex: 1 1 auto; -} - -.adf-full-width { - width: 100%; -} - -.adf-lock-file-name { - .mat-checkbox-layout { - width: 100%; - } - - .mat-checkbox-label { - text-overflow: ellipsis; - overflow: hidden; - } - - .mat-checkbox-inner-container { - margin: auto 8px auto 0; - } -} - @mixin adf-dialog-theme($theme) { $primary: map-get($theme, primary); $foreground: map-get($theme, foreground); + .adf-fill-remaining-space { + flex: 1 1 auto; + } + + .adf-full-width { + width: 100%; + } + + .adf-lock-file-name { + .mat-checkbox-layout { + width: 100%; + } + + .mat-checkbox-label { + text-overflow: ellipsis; + overflow: hidden; + } + + .mat-checkbox-inner-container { + margin: auto 8px auto 0; + } + } + .adf-dialog-buttons button { text-transform: uppercase; } diff --git a/lib/content-services/src/lib/dialogs/folder.dialog.ts b/lib/content-services/src/lib/dialogs/folder.dialog.ts index f7188741cb..36b16efd50 100644 --- a/lib/content-services/src/lib/dialogs/folder.dialog.ts +++ b/lib/content-services/src/lib/dialogs/folder.dialog.ts @@ -17,7 +17,7 @@ import { Observable } from 'rxjs'; -import { Component, Inject, OnInit, Optional, EventEmitter, Output } from '@angular/core'; +import { Component, Inject, OnInit, Optional, EventEmitter, Output, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @@ -28,8 +28,8 @@ import { forbidEndingDot, forbidOnlySpaces, forbidSpecialCharacters } from './fo @Component({ selector: 'adf-folder-dialog', - styleUrls: ['./folder.dialog.scss'], - templateUrl: './folder.dialog.html' + templateUrl: './folder.dialog.html', + encapsulation: ViewEncapsulation.None }) export class FolderDialogComponent implements OnInit { diff --git a/lib/content-services/src/lib/dialogs/node-lock.dialog.ts b/lib/content-services/src/lib/dialogs/node-lock.dialog.ts index f9576e1c07..c520806b3f 100644 --- a/lib/content-services/src/lib/dialogs/node-lock.dialog.ts +++ b/lib/content-services/src/lib/dialogs/node-lock.dialog.ts @@ -17,7 +17,7 @@ import moment from 'moment-es6'; -import { Component, Inject, OnInit, Optional } from '@angular/core'; +import { Component, Inject, OnInit, Optional, ViewEncapsulation } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FormBuilder, FormGroup } from '@angular/forms'; @@ -26,8 +26,8 @@ import { AlfrescoApiService } from '@alfresco/adf-core'; @Component({ selector: 'adf-node-lock', - styleUrls: ['./folder.dialog.scss'], - templateUrl: './node-lock.dialog.html' + templateUrl: './node-lock.dialog.html', + encapsulation: ViewEncapsulation.None }) export class NodeLockDialogComponent implements OnInit { diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.scss b/lib/content-services/src/lib/document-list/components/document-list.component.scss index aae8c1b5af..a4f838e042 100644 --- a/lib/content-services/src/lib/document-list/components/document-list.component.scss +++ b/lib/content-services/src/lib/document-list/components/document-list.component.scss @@ -154,7 +154,7 @@ word-break: break-all; white-space: pre-line; - @media screen and ($mat-xsmall) { + @media screen and (max-width: 599px) { font-size: 48px; } } @@ -176,7 +176,7 @@ object-fit: contain; margin-top: 17px; - @media screen and ($mat-xsmall) { + @media screen and (max-width: 599px) { width: 250px; } } diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.ts b/lib/content-services/src/lib/document-list/components/document-list.component.ts index 465450034d..d128eb49eb 100644 --- a/lib/content-services/src/lib/document-list/components/document-list.component.ts +++ b/lib/content-services/src/lib/document-list/components/document-list.component.ts @@ -65,7 +65,6 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'adf-document-list', - styleUrls: ['./document-list.component.scss'], templateUrl: './document-list.component.html', encapsulation: ViewEncapsulation.None, host: { class: 'adf-document-list' } diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts index 4ec5a90667..d2231d4549 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts @@ -24,7 +24,6 @@ import { MemberModel } from '../../models/member.model'; @Component({ selector: 'adf-add-permission-dialog', templateUrl: './add-permission-dialog.component.html', - styleUrls: ['./add-permission-dialog.component.scss'], encapsulation: ViewEncapsulation.None }) export class AddPermissionDialogComponent { diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss index 339863aa75..75174785d7 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss @@ -1,9 +1,6 @@ @mixin adf-add-permission-panel-theme($theme) { - - $background: map-get($theme, background); $foreground: map-get($theme, foreground); $primary: map-get($theme, primary); - $accent: map-get($theme, accent); $mat-menu-border-radius: 2px !default; $search-result-height: calc(100% - 75px); diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts index 1dd95faa25..095732f7db 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts @@ -26,7 +26,6 @@ import { SearchComponent } from '../../../search/components/search.component'; @Component({ selector: 'adf-add-permission-panel', templateUrl: './add-permission-panel.component.html', - styleUrls: ['./add-permission-panel.component.scss'], encapsulation: ViewEncapsulation.None, providers: [ { provide: SearchConfigurationService, useClass: SearchPermissionConfigurationService }, diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts index f36de1b5c0..8107e9674d 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts @@ -24,7 +24,6 @@ import { RoleModel } from '../../models/role.model'; @Component({ selector: 'adf-add-permission', templateUrl: './add-permission.component.html', - styleUrls: ['./add-permission.component.scss'], encapsulation: ViewEncapsulation.None }) /* diff --git a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.scss b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.scss index 0f07152f11..e2489757aa 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.scss @@ -1,36 +1,32 @@ -@mixin adf-permission-container-theme($theme) { - $adf-permission-list-width: 100% !default; +.adf-datatable-permission { + display: flex; + min-width: 450px; + width: 100%; - .adf-datatable-permission { - display: flex; - min-width: 450px; - width: $adf-permission-list-width; + &.adf-datatable { + overflow: hidden; - &.adf-datatable { - overflow: hidden; + .adf-delete-permission-column { + min-width: 80px; - .adf-delete-permission-column { - min-width: 80px; - - .adf-cell-value { - width: 80px; - padding-right: 10px; - place-content: flex-end; - } + .adf-cell-value { + width: 80px; + padding-right: 10px; + place-content: flex-end; } + } - .adf-authorityId-column { - flex: 40%; - } + .adf-authorityId-column { + flex: 40%; + } - .adf-authority-icon-column { - min-width: 40px; - } + .adf-authority-icon-column { + min-width: 40px; + } - .adf-datatable-selected > svg { - width: 40px; - height: 40px; - } + .adf-datatable-selected > svg { + width: 40px; + height: 40px; } } } diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss index c78c4ca195..c86ed82136 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss @@ -1,9 +1,5 @@ @mixin adf-permission-list-theme($theme) { - $primary: map-get($theme, primary); - $accent: map-get($theme, accent); - $warn: map-get($theme, warn); $foreground: map-get($theme, foreground); - $background: map-get($theme, background); .adf { &-permission-card { diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts index 37b5da8d6b..ec5ece85d0 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts @@ -24,7 +24,6 @@ import { PermissionListService } from './permission-list.service'; @Component({ selector: 'adf-permission-list', templateUrl: './permission-list.component.html', - styleUrls: ['./permission-list.component.scss'], encapsulation: ViewEncapsulation.None }) export class PermissionListComponent { diff --git a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.scss b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.scss index 2acd8cfcd9..6e99d09a1d 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.scss @@ -1,6 +1,5 @@ @mixin adf-user-icon-column-theme($theme) { $primary: map-get($theme, primary); - $document-list-selection-color: mat-color($accent) !default; .adf { &-people-initial { @@ -31,7 +30,7 @@ &-people-select-icon { margin: 0 !important; svg { - fill: $document-list-selection-color; + fill: mat-color($accent); width: 40px; height: 40px; } diff --git a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts index c037897402..e13e453ade 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts @@ -34,7 +34,6 @@ import { NodePermissionService } from '../../services/node-permission.service'; `, - styleUrls: ['./user-icon-column.component.scss'], host: { class: 'adf-user-icon-column adf-datatable-content-cell' } }) export class UserIconColumnComponent implements OnInit { diff --git a/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.scss b/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.scss index 26667d42ce..bd0e0fa521 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.scss @@ -1,5 +1,4 @@ @mixin user-name-column-theme($theme) { - $primary: map-get($theme, primary); $foreground: map-get($theme, foreground); .adf-user { diff --git a/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.ts b/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.ts index 2e6152d003..5c02d009b8 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.ts @@ -32,8 +32,7 @@ import { EcmUserModel } from '@alfresco/adf-core'; `, - host: { class: 'adf-user-name-column adf-datatable-content-cell adf-expand-cell-5 adf-ellipsis-cell' }, - styleUrls: [ './user-name-column.component.scss' ] + host: { class: 'adf-user-name-column adf-datatable-content-cell adf-expand-cell-5 adf-ellipsis-cell' } }) export class UserNameColumnComponent implements OnInit { @Input() diff --git a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts index 441f47a628..bbe4381a06 100644 --- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts +++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts @@ -21,7 +21,6 @@ import { SearchFilterComponent } from '../../components/search-filter/search-fil @Component({ selector: 'adf-search-chip-list', templateUrl: './search-chip-list.component.html', - styleUrls: ['./search-chip-list.component.scss'], encapsulation: ViewEncapsulation.None, host: { class: 'adf-search-chip-list' } }) diff --git a/lib/content-services/src/lib/search/components/search-control.component.scss b/lib/content-services/src/lib/search/components/search-control.component.scss index 9c00206bd1..648e298342 100644 --- a/lib/content-services/src/lib/search/components/search-control.component.scss +++ b/lib/content-services/src/lib/search/components/search-control.component.scss @@ -1,8 +1,6 @@ @mixin adf-search-control-theme($theme) { $background: map-get($theme, background); $foreground: map-get($theme, foreground); - $primary: map-get($theme, primary); - $accent: map-get($theme, accent); $mat-menu-border-radius: 2px !default; $mat-menu-overlay-min-width: 112px !default; // 56 * 2 $mat-menu-overlay-max-width: 280px !default; // 56 * 5 @@ -29,7 +27,7 @@ background-color: mat-color($background, card); border-radius: $mat-menu-border-radius; - @media screen and ($mat-small) { + @media screen and (max-width: 959px) { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; diff --git a/lib/content-services/src/lib/search/components/search-control.component.ts b/lib/content-services/src/lib/search/components/search-control.component.ts index a32e7ac15b..0a76d83c19 100644 --- a/lib/content-services/src/lib/search/components/search-control.component.ts +++ b/lib/content-services/src/lib/search/components/search-control.component.ts @@ -27,7 +27,6 @@ import { EmptySearchResultComponent } from './empty-search-result.component'; @Component({ selector: 'adf-search-control', templateUrl: './search-control.component.html', - styleUrls: ['./search-control.component.scss'], encapsulation: ViewEncapsulation.None, host: { class: 'adf-search-control' } }) diff --git a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts index 9c34874f2e..dd34f78e34 100644 --- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts +++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts @@ -39,7 +39,6 @@ import { MatMenuTrigger } from '@angular/material/menu'; @Component({ selector: 'adf-search-filter-container', templateUrl: './search-filter-container.component.html', - styleUrls: ['./search-filter-container.component.scss'], encapsulation: ViewEncapsulation.None }) export class SearchFilterContainerComponent implements OnInit, OnDestroy { diff --git a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts index 20679c7ea8..e59225309c 100644 --- a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts +++ b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.ts @@ -35,7 +35,6 @@ export interface SelectedBucket { @Component({ selector: 'adf-search-filter', templateUrl: './search-filter.component.html', - styleUrls: ['./search-filter.component.scss'], encapsulation: ViewEncapsulation.None, host: { class: 'adf-search-filter' } }) diff --git a/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.ts b/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.ts index 532f157c11..397e1f44ce 100644 --- a/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.ts +++ b/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.ts @@ -23,7 +23,6 @@ import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token'; @Component({ selector: 'adf-search-sorting-picker', templateUrl: './search-sorting-picker.component.html', - styleUrls: ['./search-sorting-picker.component.scss'], encapsulation: ViewEncapsulation.None, host: { class: 'adf-search-sorting-picker' } }) diff --git a/lib/content-services/src/lib/search/components/search.component.scss b/lib/content-services/src/lib/search/components/search.component.scss index 933a82d969..3cda1e0544 100644 --- a/lib/content-services/src/lib/search/components/search.component.scss +++ b/lib/content-services/src/lib/search/components/search.component.scss @@ -1,19 +1,9 @@ -@mixin adf-search-autocomplete-theme($theme) { - $primary: map-get($theme, primary); - $accent: map-get($theme, accent); - $warn: map-get($theme, warn); - $foreground: map-get($theme, foreground); - $background: map-get($theme, background); - $mat-menu-border-radius: 2px !default; +.adf { + &-search-hide { + visibility: hidden; + } - .adf { - - &-search-hide { - visibility: hidden; - } - - &-search-show { - visibility: visible; - } + &-search-show { + visibility: visible; } } diff --git a/lib/content-services/src/lib/social/like.component.scss b/lib/content-services/src/lib/social/like.component.scss index a808c2ee65..6cf9a49b5d 100644 --- a/lib/content-services/src/lib/social/like.component.scss +++ b/lib/content-services/src/lib/social/like.component.scss @@ -1,11 +1,3 @@ -@mixin selected { - color: #2196f3; -} - -@mixin unselected { - color: #808080; -} - .adf-like-container { display: flex; overflow: hidden; @@ -24,17 +16,17 @@ .adf-like-select { cursor: pointer; - @include selected; + color: #2196f3; &:hover { - @include unselected; + color: #808080; } } .adf-like-grey { cursor: pointer; - @include unselected; + color: #808080; &:hover { - @include selected; + color: #2196f3; } } diff --git a/lib/content-services/src/lib/styles/_index.scss b/lib/content-services/src/lib/styles/_index.scss index 80a8bb14dc..07007c9bae 100644 --- a/lib/content-services/src/lib/styles/_index.scss +++ b/lib/content-services/src/lib/styles/_index.scss @@ -8,7 +8,6 @@ @import '../upload/components/file-uploading-dialog.component'; @import '../upload/components/upload-drag-area.component'; -@import '../search/components/search.component'; @import '../search/components/search-control.component'; @import '../search/components/search-sorting-picker/search-sorting-picker.component'; @import '../search/components/search-filter/search-filter.component'; @@ -24,12 +23,9 @@ @import '../permission-manager/components/add-permission/add-permission.component'; @import '../permission-manager/components/add-permission/add-permission-dialog.component'; @import '../permission-manager/components/add-permission/add-permission-panel.component'; -@import '../tree-view/components/tree-view.component'; @import '../version-manager/version-comparison.component'; @import '../content-type/content-type-dialog.component'; @import '../aspect-list/aspect-list.component'; -@import '../aspect-list/aspect-list-dialog.component'; -@import '../permission-manager/components/permission-container/permission-container.component'; @import '../permission-manager/components/user-icon-column/user-icon-column.component'; @import '../permission-manager/components/user-name-column/user-name-column.component'; @@ -44,24 +40,20 @@ @include adf-upload-dialog-theme($theme); @include adf-upload-drag-area-theme($theme); @include adf-search-control-theme($theme); - @include adf-search-autocomplete-theme($theme); @include adf-search-sorting-picker-theme($theme); @include adf-filter-menu-theme($theme); @include adf-dialog-theme($theme); @include adf-content-node-selector-dialog-theme($theme); @include adf-content-metadata-module-theme($theme); @include adf-permission-list-theme($theme); - @include adf-permission-container-theme($theme); @include adf-user-icon-column-theme($theme); @include user-name-column-theme($theme); @include adf-add-permission-theme($theme); @include adf-add-permission-dialog-theme($theme); @include adf-add-permission-panel-theme($theme); - @include adf-tree-view-theme($theme); @include adf-search-filter-theme($theme); @include adf-search-chip-list-theme($theme); @include adf-version-comparison-theme($theme); @include adf-content-type-dialog-theme($theme); @include adf-aspect-list-theme($theme); - @include adf-aspect-list-dialog-theme($theme); } diff --git a/lib/content-services/src/lib/tree-view/components/tree-view.component.scss b/lib/content-services/src/lib/tree-view/components/tree-view.component.scss index d9770c9db2..5fa44e6dab 100644 --- a/lib/content-services/src/lib/tree-view/components/tree-view.component.scss +++ b/lib/content-services/src/lib/tree-view/components/tree-view.component.scss @@ -1,21 +1,15 @@ -@mixin adf-tree-view-theme($theme) { - $primary: map-get($theme, primary); - $foreground: map-get($theme, foreground); - $background: map-get($theme, background); +.adf { + &-tree-view-icon { + color: #d9e022; + } - .adf { - &-tree-view-icon { - color: #d9e022; - } + &-tree-view-node.mat-tree-node { + min-height: 40px; + font-size: 12px; + align-items: baseline; + } - &-tree-view-node.mat-tree-node { - min-height: 40px; - font-size: 12px; - align-items: baseline; - } - - &-tree-view-label { - cursor: pointer; - } + &-tree-view-label { + cursor: pointer; } } diff --git a/lib/content-services/src/lib/tree-view/components/tree-view.component.ts b/lib/content-services/src/lib/tree-view/components/tree-view.component.ts index 6b36d94990..043f9087f2 100644 --- a/lib/content-services/src/lib/tree-view/components/tree-view.component.ts +++ b/lib/content-services/src/lib/tree-view/components/tree-view.component.ts @@ -24,8 +24,8 @@ import { NodeEntry } from '@alfresco/js-api'; @Component({ selector: 'adf-tree-view-list', - templateUrl: 'tree-view.component.html', - styleUrls: ['tree-view.component.scss'] + templateUrl: './tree-view.component.html', + styleUrls: ['./tree-view.component.scss'] }) export class TreeViewComponent implements OnChanges { diff --git a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts index 106bb57e74..228277c22f 100644 --- a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts +++ b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts @@ -24,8 +24,7 @@ import { takeUntil, delay } from 'rxjs/operators'; @Component({ selector: 'adf-file-uploading-dialog', - templateUrl: './file-uploading-dialog.component.html', - styleUrls: ['./file-uploading-dialog.component.scss'] + templateUrl: './file-uploading-dialog.component.html' }) export class FileUploadingDialogComponent implements OnInit, OnDestroy { /** Dialog direction. Can be 'ltr' or 'rtl. */ diff --git a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts index 4ab520c834..bfd8d004ec 100644 --- a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts +++ b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts @@ -20,8 +20,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; @Component({ selector: 'adf-file-uploading-list-row', - templateUrl: './file-uploading-list-row.component.html', - styleUrls: ['./file-uploading-list-row.component.scss'] + templateUrl: './file-uploading-list-row.component.html' }) export class FileUploadingListRowComponent { @Input() diff --git a/lib/content-services/src/lib/upload/components/upload-drag-area.component.ts b/lib/content-services/src/lib/upload/components/upload-drag-area.component.ts index 65371c8150..8128a1f9ec 100644 --- a/lib/content-services/src/lib/upload/components/upload-drag-area.component.ts +++ b/lib/content-services/src/lib/upload/components/upload-drag-area.component.ts @@ -25,7 +25,6 @@ import { UploadBase } from './base-upload/upload-base'; @Component({ selector: 'adf-upload-drag-area', templateUrl: './upload-drag-area.component.html', - styleUrls: ['./upload-drag-area.component.scss'], host: {'class': 'adf-upload-drag-area'}, viewProviders: [ {provide: EXTENDIBLE_COMPONENT, useExisting: forwardRef(() => UploadDragAreaComponent)} diff --git a/lib/content-services/src/lib/version-manager/version-comparison.component.ts b/lib/content-services/src/lib/version-manager/version-comparison.component.ts index b45898104c..e2810ad4a6 100644 --- a/lib/content-services/src/lib/version-manager/version-comparison.component.ts +++ b/lib/content-services/src/lib/version-manager/version-comparison.component.ts @@ -21,8 +21,7 @@ import { ThumbnailService } from '@alfresco/adf-core'; @Component({ selector: 'adf-version-comparison', - templateUrl: './version-comparison.component.html', - styleUrls: ['./version-comparison.component.scss'] + templateUrl: './version-comparison.component.html' }) export class VersionComparisonComponent { diff --git a/lib/content-services/src/lib/webscript/webscript.component.ts b/lib/content-services/src/lib/webscript/webscript.component.ts index 89bdd02489..87bd39a724 100644 --- a/lib/content-services/src/lib/webscript/webscript.component.ts +++ b/lib/content-services/src/lib/webscript/webscript.component.ts @@ -40,7 +40,7 @@ import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core */ @Component({ selector: 'adf-webscript-get', - templateUrl: 'webscript.component.html' + templateUrl: './webscript.component.html' }) export class WebscriptComponent implements OnChanges { diff --git a/lib/core/buttons-menu/buttons-menu.component.scss b/lib/core/buttons-menu/buttons-menu.component.scss index fbf65418a0..3eba58f956 100644 --- a/lib/core/buttons-menu/buttons-menu.component.scss +++ b/lib/core/buttons-menu/buttons-menu.component.scss @@ -1,32 +1,29 @@ -@mixin adf-buttons-menu-theme($theme) { +.adf-buttons-menu { + margin-right: 10px; - .adf-buttons-menu { + & div { + display: flex; + } + + &-mobile { margin-right: 10px; + } - & div { - display: flex; + &-desktop { + display: flex; + + button { + color: black; + padding: 0; } - &-mobile { - margin-right: 10px; + button > span { + display: none; } - &-desktop { - display: flex; - - button { - color: black; - padding: 0; - } - - button > span { - display: none; - } - - button > mat-icon.mat-icon.material-icons { - color: black; - margin: 0 10px; - } + button > mat-icon.mat-icon.material-icons { + color: black; + margin: 0 10px; } } } diff --git a/lib/core/buttons-menu/buttons-menu.component.ts b/lib/core/buttons-menu/buttons-menu.component.ts index 7c6bd162e2..dcf0b3ca33 100644 --- a/lib/core/buttons-menu/buttons-menu.component.ts +++ b/lib/core/buttons-menu/buttons-menu.component.ts @@ -15,13 +15,14 @@ * limitations under the License. */ -import { Component, ContentChildren, QueryList, AfterContentInit } from '@angular/core'; +import { Component, ContentChildren, QueryList, AfterContentInit, ViewEncapsulation } from '@angular/core'; import { MatMenuItem } from '@angular/material/menu'; @Component({ selector: 'adf-buttons-action-menu', templateUrl: './buttons-menu.component.html', - styleUrls: ['./buttons-menu.component.scss'] + styleUrls: ['./buttons-menu.component.scss'], + encapsulation: ViewEncapsulation.None }) export class ButtonsMenuComponent implements AfterContentInit { diff --git a/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss b/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss index f1198329d1..5de373ca90 100644 --- a/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss +++ b/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-card-view-array-item-theme($theme) { $foreground: map-get($theme, foreground); diff --git a/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts b/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts index 04f82608e8..440fef3fbc 100644 --- a/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts +++ b/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts @@ -22,8 +22,7 @@ import { BaseCardView } from '../base-card-view'; @Component({ selector: 'adf-card-view-arrayitem', - templateUrl: './card-view-arrayitem.component.html', - styleUrls: ['./card-view-arrayitem.component.scss'] + templateUrl: './card-view-arrayitem.component.html' }) export class CardViewArrayItemComponent extends BaseCardView { diff --git a/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.scss b/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.scss deleted file mode 100644 index a94027d036..0000000000 --- a/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -.adf { -} diff --git a/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.ts b/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.ts index ca80a81caa..d802320771 100644 --- a/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.ts +++ b/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.ts @@ -23,8 +23,7 @@ import { BaseCardView } from '../base-card-view'; @Component({ selector: 'adf-card-view-boolitem', - templateUrl: './card-view-boolitem.component.html', - styleUrls: ['./card-view-boolitem.component.scss'] + templateUrl: './card-view-boolitem.component.html' }) export class CardViewBoolItemComponent extends BaseCardView { diff --git a/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts b/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts index d1651d75c9..6a18fdc7c5 100644 --- a/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts +++ b/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts @@ -41,8 +41,7 @@ import { TranslationService } from '../../../services/translation.service'; { provide: MAT_DATETIME_FORMATS, useValue: MAT_MOMENT_DATETIME_FORMATS } ], selector: 'adf-card-view-dateitem', - templateUrl: './card-view-dateitem.component.html', - styleUrls: ['./card-view-dateitem.component.scss'] + templateUrl: './card-view-dateitem.component.html' }) export class CardViewDateItemComponent extends BaseCardView implements OnInit, OnDestroy { diff --git a/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts index bd60bf57b0..b101efb628 100644 --- a/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts +++ b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts @@ -24,8 +24,7 @@ import { BaseCardView } from '../base-card-view'; @Component({ selector: 'adf-card-view-boolitem', - templateUrl: './card-view-keyvaluepairsitem.component.html', - styleUrls: ['./card-view-keyvaluepairsitem.component.scss'] + templateUrl: './card-view-keyvaluepairsitem.component.html' }) export class CardViewKeyValuePairsItemComponent extends BaseCardView implements OnChanges { diff --git a/lib/core/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts b/lib/core/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts index 3f00dfb39b..563b784c51 100644 --- a/lib/core/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts +++ b/lib/core/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts @@ -24,7 +24,6 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'adf-select-filter-input', templateUrl: './select-filter-input.component.html', - styleUrls: ['./select-filter-input.component.scss'], host: { 'class': 'adf-select-filter-input' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.scss b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.scss index 0f20b95da3..cd2e49d057 100644 --- a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.scss +++ b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-card-view-textitem-theme($theme) { $foreground: map-get($theme, foreground); $outline: 1px solid mat-color($alfresco-ecm-blue, A200) !default; diff --git a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.ts b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.ts index 77f9a0b6b7..661b9035a4 100644 --- a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.ts +++ b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.ts @@ -38,8 +38,7 @@ const templateTypes = { @Component({ selector: 'adf-card-view-textitem', - templateUrl: './card-view-textitem.component.html', - styleUrls: ['./card-view-textitem.component.scss'] + templateUrl: './card-view-textitem.component.html' }) export class CardViewTextItemComponent extends BaseCardView implements OnChanges { diff --git a/lib/core/card-view/components/card-view/card-view.component.scss b/lib/core/card-view/components/card-view/card-view.component.scss index 7719ba4bf3..16cb391334 100644 --- a/lib/core/card-view/components/card-view/card-view.component.scss +++ b/lib/core/card-view/components/card-view/card-view.component.scss @@ -1,7 +1,4 @@ -@import '~@angular/material/theming'; - @mixin adf-card-view-theme($theme) { - $primary: map-get($theme, primary); $foreground: map-get($theme, foreground); .adf-property-list { diff --git a/lib/core/card-view/components/card-view/card-view.component.ts b/lib/core/card-view/components/card-view/card-view.component.ts index 8254ffe00e..fea8fc7ab2 100644 --- a/lib/core/card-view/components/card-view/card-view.component.ts +++ b/lib/core/card-view/components/card-view/card-view.component.ts @@ -21,8 +21,7 @@ import { DEFAULT_SEPARATOR } from '../card-view-textitem/card-view-textitem.comp @Component({ selector: 'adf-card-view', - templateUrl: './card-view.component.html', - styleUrls: ['./card-view.component.scss'] + templateUrl: './card-view.component.html' }) export class CardViewComponent { /** (**required**) Items to show in the card view. */ diff --git a/lib/core/clipboard/clipboard.component.scss b/lib/core/clipboard/clipboard.component.scss index 18474e66be..1c42383b65 100644 --- a/lib/core/clipboard/clipboard.component.scss +++ b/lib/core/clipboard/clipboard.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-clipboard-theme($theme) { $primary: map-get($theme, primary); $config: mat-typography-config(); diff --git a/lib/core/clipboard/clipboard.directive.ts b/lib/core/clipboard/clipboard.directive.ts index 68f27b50e3..7fe1c5db1f 100644 --- a/lib/core/clipboard/clipboard.directive.ts +++ b/lib/core/clipboard/clipboard.directive.ts @@ -78,10 +78,7 @@ export class ClipboardDirective { @Component({ selector: 'adf-copy-content-tooltip', - template: ` - {{ placeholder | translate }} - `, - styleUrls: ['./clipboard.component.scss'], + template: `{{ placeholder | translate }} `, encapsulation: ViewEncapsulation.None }) export class ClipboardComponent implements OnInit { diff --git a/lib/core/comments/comment-list.component.scss b/lib/core/comments/comment-list.component.scss index 976ba12c52..2164756f62 100644 --- a/lib/core/comments/comment-list.component.scss +++ b/lib/core/comments/comment-list.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-task-list-comment-list-theme($theme) { $primary: map-get($theme, primary); $foreground: map-get($theme, foreground); diff --git a/lib/core/comments/comment-list.component.ts b/lib/core/comments/comment-list.component.ts index 3adc575eec..84d6b9ec30 100644 --- a/lib/core/comments/comment-list.component.ts +++ b/lib/core/comments/comment-list.component.ts @@ -26,7 +26,6 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'adf-comment-list', templateUrl: './comment-list.component.html', - styleUrls: ['./comment-list.component.scss'], encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/comments/comments.component.scss b/lib/core/comments/comments.component.scss index 901ae3ffe2..e194ef450d 100644 --- a/lib/core/comments/comments.component.scss +++ b/lib/core/comments/comments.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-task-list-comment-theme($theme) { $foreground: map-get($theme, foreground); $header-border: 1px solid mat-color($foreground, divider); diff --git a/lib/core/comments/comments.component.ts b/lib/core/comments/comments.component.ts index 065260b6fe..6f812f2a93 100644 --- a/lib/core/comments/comments.component.ts +++ b/lib/core/comments/comments.component.ts @@ -24,8 +24,7 @@ import { share } from 'rxjs/operators'; @Component({ selector: 'adf-comments', - templateUrl: './comments.component.html', - styleUrls: ['./comments.component.scss'] + templateUrl: './comments.component.html' }) export class CommentsComponent implements OnChanges { diff --git a/lib/core/datatable/components/datatable/datatable.component.scss b/lib/core/datatable/components/datatable/datatable.component.scss index 7f08642b39..ba4e4403b8 100644 --- a/lib/core/datatable/components/datatable/datatable.component.scss +++ b/lib/core/datatable/components/datatable/datatable.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-datatable-theme($theme) { $foreground: map-get($theme, foreground); $background: map-get($theme, background); diff --git a/lib/core/datatable/components/datatable/datatable.component.ts b/lib/core/datatable/components/datatable/datatable.component.ts index eed4c4c313..587c0945c6 100644 --- a/lib/core/datatable/components/datatable/datatable.component.ts +++ b/lib/core/datatable/components/datatable/datatable.component.ts @@ -51,7 +51,6 @@ export enum ShowHeaderMode { @Component({ selector: 'adf-datatable', - styleUrls: ['./datatable.component.scss'], templateUrl: './datatable.component.html', encapsulation: ViewEncapsulation.None, host: { class: 'adf-datatable' } diff --git a/lib/core/dialogs/edit-json/edit-json.dialog.ts b/lib/core/dialogs/edit-json/edit-json.dialog.ts index 46652ee20d..ef54518309 100644 --- a/lib/core/dialogs/edit-json/edit-json.dialog.ts +++ b/lib/core/dialogs/edit-json/edit-json.dialog.ts @@ -25,8 +25,8 @@ export interface EditJsonDialogSettings { } @Component({ - templateUrl: 'edit-json.dialog.html', - styleUrls: ['edit-json.dialog.scss'], + templateUrl: './edit-json.dialog.html', + styleUrls: ['./edit-json.dialog.scss'], encapsulation: ViewEncapsulation.None, host: { class: 'adf-edit-json-dialog' } }) diff --git a/lib/core/directives/tooltip-card/tooltip-card.component.scss b/lib/core/directives/tooltip-card/tooltip-card.component.scss index ff0265528d..929a4ce219 100644 --- a/lib/core/directives/tooltip-card/tooltip-card.component.scss +++ b/lib/core/directives/tooltip-card/tooltip-card.component.scss @@ -1,8 +1,5 @@ -@import '~@angular/material/theming'; - @mixin adf-tooltip-card-directive($theme) { $primary: map-get($theme, primary); - $accent: map-get($theme, accent); $foreground: map-get($theme, foreground); $background: map-get($theme, background); diff --git a/lib/core/directives/tooltip-card/tooltip-card.component.ts b/lib/core/directives/tooltip-card/tooltip-card.component.ts index 9112b019ff..bbbc986271 100644 --- a/lib/core/directives/tooltip-card/tooltip-card.component.ts +++ b/lib/core/directives/tooltip-card/tooltip-card.component.ts @@ -20,7 +20,6 @@ import { DomSanitizer } from '@angular/platform-browser'; @Component({ selector: 'adf-tooltip-card-component', - styleUrls: ['./tooltip-card.component.scss'], templateUrl: './tooltip-card.component.html', animations: [ trigger('tooltip', [ diff --git a/lib/core/form/components/form-list.component.scss b/lib/core/form/components/form-list.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lib/core/form/components/form-list.component.ts b/lib/core/form/components/form-list.component.ts index d5075871d0..c816de2851 100644 --- a/lib/core/form/components/form-list.component.ts +++ b/lib/core/form/components/form-list.component.ts @@ -21,7 +21,6 @@ import { FormService } from './../services/form.service'; @Component({ selector: 'adf-form-list', templateUrl: './form-list.component.html', - styleUrls: ['./form-list.component.scss'], encapsulation: ViewEncapsulation.None }) export class FormListComponent implements OnChanges { diff --git a/lib/core/form/components/form-renderer.component.scss b/lib/core/form/components/form-renderer.component.scss index 5cf1cef883..1634215e9b 100644 --- a/lib/core/form/components/form-renderer.component.scss +++ b/lib/core/form/components/form-renderer.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-form-renderer-theme($theme) { $config: mat-typography-config(); diff --git a/lib/core/form/components/form-renderer.component.ts b/lib/core/form/components/form-renderer.component.ts index 1deb4323fe..4de6a38620 100644 --- a/lib/core/form/components/form-renderer.component.ts +++ b/lib/core/form/components/form-renderer.component.ts @@ -21,7 +21,6 @@ import { FormModel } from './widgets/core/form.model'; @Component({ selector: 'adf-form-renderer', templateUrl: './form-renderer.component.html', - styleUrls: ['./form-renderer.component.scss'], encapsulation: ViewEncapsulation.None }) export class FormRendererComponent { diff --git a/lib/core/form/components/widgets/amount/amount.widget.scss b/lib/core/form/components/widgets/amount/amount.widget.scss index 7b31047a78..0366c8c393 100644 --- a/lib/core/form/components/widgets/amount/amount.widget.scss +++ b/lib/core/form/components/widgets/amount/amount.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - @mixin adf-amount-widget-theme($theme) { $foreground: map-get($theme, foreground); diff --git a/lib/core/form/components/widgets/amount/amount.widget.ts b/lib/core/form/components/widgets/amount/amount.widget.ts index bb02836bbf..7533e823a0 100644 --- a/lib/core/form/components/widgets/amount/amount.widget.ts +++ b/lib/core/form/components/widgets/amount/amount.widget.ts @@ -30,7 +30,6 @@ export const ADF_AMOUNT_SETTINGS = new InjectionToken('adf @Component({ selector: 'amount-widget', templateUrl: './amount.widget.html', - styleUrls: ['./amount.widget.scss'], host: { '(click)': 'event($event)', '(blur)': 'event($event)', diff --git a/lib/core/form/components/widgets/container/container.widget.scss b/lib/core/form/components/widgets/container/container.widget.scss index 58c7615d88..461752310e 100644 --- a/lib/core/form/components/widgets/container/container.widget.scss +++ b/lib/core/form/components/widgets/container/container.widget.scss @@ -1,9 +1,5 @@ -@import '~@angular/material/theming'; - @mixin adf-form-container-widget-theme($theme) { $primary: map-get($theme, primary); - $accent: map-get($theme, accent); - $warn: map-get($theme, warn); .adf-hidden { display: none; @@ -66,7 +62,7 @@ padding-right: 3px; } - @media screen and ($mat-small) { + @media screen and (max-width: 959px) { .adf-grid-list-item { flex: 1 0 100%; } diff --git a/lib/core/form/components/widgets/container/container.widget.ts b/lib/core/form/components/widgets/container/container.widget.ts index 027b581388..4d3d9009ac 100644 --- a/lib/core/form/components/widgets/container/container.widget.ts +++ b/lib/core/form/components/widgets/container/container.widget.ts @@ -26,7 +26,6 @@ import { ContainerWidgetComponentModel } from './container.widget.model'; @Component({ selector: 'container-widget', templateUrl: './container.widget.html', - styleUrls: ['./container.widget.scss'], host: { '(click)': 'event($event)', '(blur)': 'event($event)', diff --git a/lib/core/form/components/widgets/date-time/date-time.widget.scss b/lib/core/form/components/widgets/date-time/date-time.widget.scss index 0a9fbee0cd..681a3c6c40 100644 --- a/lib/core/form/components/widgets/date-time/date-time.widget.scss +++ b/lib/core/form/components/widgets/date-time/date-time.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - .adf { &-date-time-widget { .mat-form-field-suffix { diff --git a/lib/core/form/components/widgets/date/date.widget.scss b/lib/core/form/components/widgets/date/date.widget.scss index de58adb7ee..ed055897d3 100644 --- a/lib/core/form/components/widgets/date/date.widget.scss +++ b/lib/core/form/components/widgets/date/date.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - .adf { &-date-widget { .mat-form-field-suffix { diff --git a/lib/core/form/components/widgets/document/document.widget.ts b/lib/core/form/components/widgets/document/document.widget.ts index 64a55c2ffe..5c57f9ddc7 100644 --- a/lib/core/form/components/widgets/document/document.widget.ts +++ b/lib/core/form/components/widgets/document/document.widget.ts @@ -21,7 +21,7 @@ import { WidgetComponent } from './../widget.component'; @Component({ selector: 'adf-form-document-widget', - templateUrl: 'document.widget.html', + templateUrl: './document.widget.html', host: { '(click)': 'event($event)', '(blur)': 'event($event)', diff --git a/lib/core/form/components/widgets/dropdown/dropdown.widget.scss b/lib/core/form/components/widgets/dropdown/dropdown.widget.scss index 83670184cb..6a37ab5950 100644 --- a/lib/core/form/components/widgets/dropdown/dropdown.widget.scss +++ b/lib/core/form/components/widgets/dropdown/dropdown.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - .adf { &-dropdown-widget { width: 100%; diff --git a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss index 103f3a1265..63f14eebda 100644 --- a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss +++ b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.scss @@ -1,6 +1,3 @@ -@import '~@angular/material/theming'; -@import '../form'; - @mixin adf-dynamic-table-theme($theme) { $foreground: map-get($theme, foreground); $dynamic-table-font-size: 14px !default; diff --git a/lib/core/form/components/widgets/file-viewer/file-viewer.widget.scss b/lib/core/form/components/widgets/file-viewer/file-viewer.widget.scss index b1d93c8cd0..4af97c452d 100644 --- a/lib/core/form/components/widgets/file-viewer/file-viewer.widget.scss +++ b/lib/core/form/components/widgets/file-viewer/file-viewer.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - file-viewer-widget { height: 100%; width: 100%; diff --git a/lib/core/form/components/widgets/form.scss b/lib/core/form/components/widgets/form.scss index 9ab61dd306..70692a4726 100644 --- a/lib/core/form/components/widgets/form.scss +++ b/lib/core/form/components/widgets/form.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-form-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); diff --git a/lib/core/form/components/widgets/functional-group/functional-group.widget.scss b/lib/core/form/components/widgets/functional-group/functional-group.widget.scss index 744a3ce886..5c6e8ffb90 100644 --- a/lib/core/form/components/widgets/functional-group/functional-group.widget.scss +++ b/lib/core/form/components/widgets/functional-group/functional-group.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - .adf { &-group-widget { diff --git a/lib/core/form/components/widgets/hyperlink/hyperlink.widget.scss b/lib/core/form/components/widgets/hyperlink/hyperlink.widget.scss index f4e125b0f9..739c0a9ce5 100644 --- a/lib/core/form/components/widgets/hyperlink/hyperlink.widget.scss +++ b/lib/core/form/components/widgets/hyperlink/hyperlink.widget.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-hyperlink-widget-theme($theme) { $primary: map-get($theme, primary); diff --git a/lib/core/form/components/widgets/hyperlink/hyperlink.widget.ts b/lib/core/form/components/widgets/hyperlink/hyperlink.widget.ts index 32fd9d00bb..e6dea0b70b 100644 --- a/lib/core/form/components/widgets/hyperlink/hyperlink.widget.ts +++ b/lib/core/form/components/widgets/hyperlink/hyperlink.widget.ts @@ -25,7 +25,6 @@ import { FormFieldModel } from '../core'; @Component({ selector: 'hyperlink-widget', templateUrl: './hyperlink.widget.html', - styleUrls: ['./hyperlink.widget.scss'], host: { '(click)': 'event($event)', '(blur)': 'event($event)', diff --git a/lib/core/form/components/widgets/number/number.widget.scss b/lib/core/form/components/widgets/number/number.widget.scss index 76b37b5218..b8718f9f87 100644 --- a/lib/core/form/components/widgets/number/number.widget.scss +++ b/lib/core/form/components/widgets/number/number.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - .adf { &-number-widget { width: 100%; diff --git a/lib/core/form/components/widgets/people/people.widget.scss b/lib/core/form/components/widgets/people/people.widget.scss index 668d3ac214..9f23320597 100644 --- a/lib/core/form/components/widgets/people/people.widget.scss +++ b/lib/core/form/components/widgets/people/people.widget.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-form-people-widget-theme($theme) { $primary: map-get($theme, primary); $background: map-get($theme, background); diff --git a/lib/core/form/components/widgets/people/people.widget.ts b/lib/core/form/components/widgets/people/people.widget.ts index ba5ce1170d..8b2938859e 100644 --- a/lib/core/form/components/widgets/people/people.widget.ts +++ b/lib/core/form/components/widgets/people/people.widget.ts @@ -36,7 +36,6 @@ import { @Component({ selector: 'people-widget', templateUrl: './people.widget.html', - styleUrls: ['./people.widget.scss'], host: { '(click)': 'event($event)', '(blur)': 'event($event)', diff --git a/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.scss b/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.scss index f9e3615366..4b2b48c05c 100644 --- a/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.scss +++ b/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - .adf { &-radio-button-container { diff --git a/lib/core/form/components/widgets/text/text.widget.scss b/lib/core/form/components/widgets/text/text.widget.scss index 30b5421d63..b76bd34171 100644 --- a/lib/core/form/components/widgets/text/text.widget.scss +++ b/lib/core/form/components/widgets/text/text.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - .adf { &-text-widget { width: 100%; diff --git a/lib/core/form/components/widgets/typeahead/typeahead.widget.scss b/lib/core/form/components/widgets/typeahead/typeahead.widget.scss index 84f6b91b59..a197d4b552 100644 --- a/lib/core/form/components/widgets/typeahead/typeahead.widget.scss +++ b/lib/core/form/components/widgets/typeahead/typeahead.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - .adf { &-typeahead-widget-container { diff --git a/lib/core/form/components/widgets/upload-folder/upload-folder.widget.scss b/lib/core/form/components/widgets/upload-folder/upload-folder.widget.scss index 2dddb9ee90..3735e8ee9d 100644 --- a/lib/core/form/components/widgets/upload-folder/upload-folder.widget.scss +++ b/lib/core/form/components/widgets/upload-folder/upload-folder.widget.scss @@ -1,6 +1,3 @@ -@import '../form'; - - .adf { &-upload-folder-widget { diff --git a/lib/core/form/components/widgets/upload/upload.widget.scss b/lib/core/form/components/widgets/upload/upload.widget.scss index a177c72d67..a21b1e16c5 100644 --- a/lib/core/form/components/widgets/upload/upload.widget.scss +++ b/lib/core/form/components/widgets/upload/upload.widget.scss @@ -1,5 +1,3 @@ -@import '../form'; - .adf { &-upload-widget-container { diff --git a/lib/core/info-drawer/info-drawer-layout.component.scss b/lib/core/info-drawer/info-drawer-layout.component.scss index 7a88a2e594..829dcc673c 100644 --- a/lib/core/info-drawer/info-drawer-layout.component.scss +++ b/lib/core/info-drawer/info-drawer-layout.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-info-drawer-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); diff --git a/lib/core/info-drawer/info-drawer-layout.component.ts b/lib/core/info-drawer/info-drawer-layout.component.ts index bc897f0f30..65fb795342 100644 --- a/lib/core/info-drawer/info-drawer-layout.component.ts +++ b/lib/core/info-drawer/info-drawer-layout.component.ts @@ -20,7 +20,6 @@ import { Component, Directive, Input, ViewEncapsulation } from '@angular/core'; @Component({ selector: 'adf-info-drawer-layout', templateUrl: './info-drawer-layout.component.html', - styleUrls: ['./info-drawer-layout.component.scss'], encapsulation: ViewEncapsulation.None, host: { 'class': 'adf-info-drawer-layout' } }) diff --git a/lib/core/layout/components/header/header.component.scss b/lib/core/layout/components/header/header.component.scss index 1d6e4f4d6e..94470f2fdc 100644 --- a/lib/core/layout/components/header/header.component.scss +++ b/lib/core/layout/components/header/header.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-header-layout-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); @@ -54,7 +52,7 @@ padding: 0; } - @media screen and ($mat-xsmall) { + @media screen and (max-width: 599px) { .adf-app-logo, .adf-app-title { display: none; diff --git a/lib/core/layout/components/layout-container/layout-container.component.scss b/lib/core/layout/components/layout-container/layout-container.component.scss index 6e41d72541..53a6772a5e 100644 --- a/lib/core/layout/components/layout-container/layout-container.component.scss +++ b/lib/core/layout/components/layout-container/layout-container.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-layout-container-theme($theme) { $background: map-get($theme, background); $foreground: map-get($theme, foreground); diff --git a/lib/core/layout/components/layout-container/layout-container.component.ts b/lib/core/layout/components/layout-container/layout-container.component.ts index 79a3ab849b..39b9b42dec 100644 --- a/lib/core/layout/components/layout-container/layout-container.component.ts +++ b/lib/core/layout/components/layout-container/layout-container.component.ts @@ -23,7 +23,6 @@ import { Direction } from '@angular/cdk/bidi'; @Component({ selector: 'adf-layout-container', templateUrl: './layout-container.component.html', - styleUrls: ['./layout-container.component.scss'], encapsulation: ViewEncapsulation.None, animations: [sidenavAnimation, contentAnimation] }) diff --git a/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss index bfbc6af5a5..8b4757e27e 100644 --- a/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss +++ b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-sidebar-action-menu-theme($theme) { $primary: map-get($theme, primary); diff --git a/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.ts b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.ts index 556e963ec0..5edda5bc57 100644 --- a/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.ts +++ b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.ts @@ -20,7 +20,6 @@ import { ChangeDetectionStrategy, Component, Directive, Input, ViewEncapsulation @Component({ selector: 'adf-sidebar-action-menu', templateUrl: './sidebar-action-menu.component.html', - styleUrls: ['./sidebar-action-menu.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, host: { 'class': 'adf-sidebar-action-menu' } diff --git a/lib/core/layout/components/sidenav-layout/sidenav-layout.component.scss b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.scss index fae1849d86..63580d5172 100644 --- a/lib/core/layout/components/sidenav-layout/sidenav-layout.component.scss +++ b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.scss @@ -1,6 +1,4 @@ @mixin adf-sidenav-layout-theme($theme) { - $adf-sidenav-max: 300px !default; - .adf-sidenav-layout { &-full-space { @@ -27,7 +25,7 @@ @include layout-bp(lt-sm) { .mat-drawer { width: calc(-50px + 100vw) !important; - max-width: $adf-sidenav-max !important; + max-width: 300px !important; } } diff --git a/lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts index 5de22c226b..b2e99fac96 100644 --- a/lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts +++ b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts @@ -40,7 +40,6 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'adf-sidenav-layout', templateUrl: './sidenav-layout.component.html', - styleUrls: ['./sidenav-layout.component.scss'], encapsulation: ViewEncapsulation.None, host: { class: 'adf-sidenav-layout' } }) diff --git a/lib/core/login/components/login-dialog-panel.component.scss b/lib/core/login/components/login-dialog-panel.component.scss index a7dc7338e0..2c04c315b1 100644 --- a/lib/core/login/components/login-dialog-panel.component.scss +++ b/lib/core/login/components/login-dialog-panel.component.scss @@ -1,20 +1,8 @@ -@import '~@angular/material/theming'; - -@mixin adf-login-dialog-panel-theme($theme) { - $primary: map-get($theme, primary); - $accent: map-get($theme, accent); - $warn: map-get($theme, warn); - $background: map-get($theme, background); - $foreground: map-get($theme, foreground); - $text-color-primary: mat-color($foreground, text); - - .adf-panel-login-dialog-component .adf-login-content { - .mat-card-actions, - .adf-login-button, - .adf-login__remember-me, - .adf-copyright { - display: none; - } +.adf-panel-login-dialog-component .adf-login-content { + .mat-card-actions, + .adf-login-button, + .adf-login__remember-me, + .adf-copyright { + display: none; } - } diff --git a/lib/core/login/components/login-dialog.component.scss b/lib/core/login/components/login-dialog.component.scss index 5189c1c24c..7956689d96 100644 --- a/lib/core/login/components/login-dialog.component.scss +++ b/lib/core/login/components/login-dialog.component.scss @@ -1,16 +1,4 @@ -@import '~@angular/material/theming'; - -@mixin adf-login-dialog-theme($theme) { - $primary: map-get($theme, primary); - $accent: map-get($theme, accent); - $warn: map-get($theme, warn); - $background: map-get($theme, background); - $foreground: map-get($theme, foreground); - $text-color-primary: mat-color($foreground, text); - - - .adf-login-dialog-content adf-login .adf-login-content .adf-login-card-wide { - padding: 0; - box-shadow: none; - } +.adf-login-dialog-content adf-login .adf-login-content .adf-login-card-wide { + padding: 0; + box-shadow: none; } diff --git a/lib/core/login/components/login.component.scss b/lib/core/login/components/login.component.scss index b8be795745..20d63382b6 100644 --- a/lib/core/login/components/login.component.scss +++ b/lib/core/login/components/login.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-login-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); diff --git a/lib/core/login/components/login.component.ts b/lib/core/login/components/login.component.ts index 07619ef64c..e1dbf51f10 100644 --- a/lib/core/login/components/login.component.ts +++ b/lib/core/login/components/login.component.ts @@ -53,7 +53,6 @@ interface ValidationMessage { @Component({ selector: 'adf-login', templateUrl: './login.component.html', - styleUrls: ['./login.component.scss'], encapsulation: ViewEncapsulation.None, host: { class: 'adf-login' diff --git a/lib/core/notifications/components/notification-history.component.ts b/lib/core/notifications/components/notification-history.component.ts index 22d3ac60a3..e9f45534e0 100644 --- a/lib/core/notifications/components/notification-history.component.ts +++ b/lib/core/notifications/components/notification-history.component.ts @@ -26,7 +26,6 @@ import { Pagination } from '@alfresco/js-api'; @Component({ selector: 'adf-notification-history', - styleUrls: ['notification-history.component.scss'], templateUrl: 'notification-history.component.html' }) export class NotificationHistoryComponent implements OnDestroy, OnInit, AfterViewInit { diff --git a/lib/core/pagination/pagination.component.scss b/lib/core/pagination/pagination.component.scss index 39b68db956..ec5c585b13 100644 --- a/lib/core/pagination/pagination.component.scss +++ b/lib/core/pagination/pagination.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-pagination-theme($theme) { $foreground: map-get($theme, foreground); diff --git a/lib/core/pagination/pagination.component.ts b/lib/core/pagination/pagination.component.ts index ec6c75ad83..c419416219 100644 --- a/lib/core/pagination/pagination.component.ts +++ b/lib/core/pagination/pagination.component.ts @@ -34,7 +34,6 @@ export type PaginationAction = selector: 'adf-pagination', host: { 'class': 'adf-pagination' }, templateUrl: './pagination.component.html', - styleUrls: ['./pagination.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/search-text/search-text-input.component.scss b/lib/core/search-text/search-text-input.component.scss index 50797fc63a..ae89070c3a 100644 --- a/lib/core/search-text/search-text-input.component.scss +++ b/lib/core/search-text/search-text-input.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-search-text-input-theme($theme) { $background: map-get($theme, background); $foreground: map-get($theme, foreground); diff --git a/lib/core/search-text/search-text-input.component.ts b/lib/core/search-text/search-text-input.component.ts index 6f8e147c11..d64c3ff42f 100644 --- a/lib/core/search-text/search-text-input.component.ts +++ b/lib/core/search-text/search-text-input.component.ts @@ -26,7 +26,6 @@ import { SearchTextStateEnum, SearchAnimationState, SearchAnimationDirection } f @Component({ selector: 'adf-search-text-input', templateUrl: './search-text-input.component.html', - styleUrls: ['./search-text-input.component.scss'], animations: [searchAnimation], encapsulation: ViewEncapsulation.None, host: { diff --git a/lib/core/settings/host-settings.component.scss b/lib/core/settings/host-settings.component.scss index 7f59ea1a0c..0a9359999b 100644 --- a/lib/core/settings/host-settings.component.scss +++ b/lib/core/settings/host-settings.component.scss @@ -1,44 +1,40 @@ -@mixin adf-host-settings-theme($theme) { +.adf-host-settings { + display: flex; + min-height: 100%; + align-items: center; - .adf-host-settings { - display: flex; - min-height: 100%; - align-items: center; - - .adf-authentication-type { - margin-bottom: 20px; - margin-top: 10px; - } - - .adf-setting-container { - width: 800px; - display: table; - margin: 0 auto; - border-collapse: collapse; - border-spacing: 0; - } - - .adf-setting-card-padding { - width: 50%; - display: table-cell; - vertical-align: middle; - margin: 0; - } - - .adf-settings-link-icon { - position: relative; - top: 6px; - margin-right: 10px; - } - - .adf-settings-actions { - display: flex; - justify-content: flex-end; - } - - .adf-full-width { - width: 100%; - } + .adf-authentication-type { + margin-bottom: 20px; + margin-top: 10px; } + .adf-setting-container { + width: 800px; + display: table; + margin: 0 auto; + border-collapse: collapse; + border-spacing: 0; + } + + .adf-setting-card-padding { + width: 50%; + display: table-cell; + vertical-align: middle; + margin: 0; + } + + .adf-settings-link-icon { + position: relative; + top: 6px; + margin-right: 10px; + } + + .adf-settings-actions { + display: flex; + justify-content: flex-end; + } + + .adf-full-width { + width: 100%; + } } diff --git a/lib/core/settings/host-settings.component.ts b/lib/core/settings/host-settings.component.ts index ffcbe2b629..37d7beb392 100644 --- a/lib/core/settings/host-settings.component.ts +++ b/lib/core/settings/host-settings.component.ts @@ -29,7 +29,7 @@ import { ENTER } from '@angular/cdk/keycodes'; host: { 'class': 'adf-host-settings' }, - styleUrls: ['host-settings.component.scss'], + styleUrls: ['./host-settings.component.scss'], encapsulation: ViewEncapsulation.None }) export class HostSettingsComponent implements OnInit { diff --git a/lib/core/styles/_default-class.scss b/lib/core/styles/_default-class.scss index fed1ebac5e..fd0e45942b 100644 --- a/lib/core/styles/_default-class.scss +++ b/lib/core/styles/_default-class.scss @@ -1,15 +1,13 @@ -@import '~@angular/material/theming'; - @mixin adf-default-class-theme($theme) { .adf-hide-small { - @media screen and ($mat-small) { + @media screen and (max-width: 959px) { display: none !important; } } .adf-hide-xsmall { - @media screen and ($mat-xsmall) { + @media screen and (max-width: 599px) { display: none !important; } } diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss index 15b06ee658..bceb167500 100644 --- a/lib/core/styles/_index.scss +++ b/lib/core/styles/_index.scss @@ -13,7 +13,6 @@ @import '../info-drawer/info-drawer-layout.component'; @import '../login/components/login.component'; @import '../pagination/pagination.component'; -@import '../settings/host-settings.component'; @import '../toolbar/toolbar.component'; @import '../userinfo/components/user-info.component'; @import '../viewer/components/viewer.component'; @@ -31,9 +30,6 @@ @import '../layout/components/sidenav-layout/sidenav-layout.component'; @import '../templates/empty-content/empty-content.component'; @import '../templates/error-content/error-content.component'; -@import '../buttons-menu/buttons-menu.component'; -@import '../login/components/login-dialog.component'; -@import '../login/components/login-dialog-panel.component'; @import '../../core/clipboard/clipboard.component'; @import '../../core/search-text/search-text-input.component'; @import './snackbar'; @@ -54,7 +50,6 @@ @include adf-info-drawer-theme($theme); @include adf-login-theme($theme); @include adf-pagination-theme($theme); - @include adf-host-settings-theme($theme); @include adf-toolbar-theme($theme); @include adf-userinfo-theme($theme); @include adf-viewer-theme($theme); @@ -70,10 +65,7 @@ @include adf-layout-container-theme($theme); @include adf-empty-content-theme($theme); @include adf-error-content-theme($theme); - @include adf-buttons-menu-theme($theme); @include adf-header-layout-theme($theme); - @include adf-login-dialog-theme($theme); - @include adf-login-dialog-panel-theme($theme); @include adf-sidenav-layout-theme($theme); @include adf-clipboard-theme($theme); @include adf-snackbar-theme($theme); diff --git a/lib/core/styles/snackbar.scss b/lib/core/styles/snackbar.scss index 53fdf41c3f..cc98a1b8e0 100644 --- a/lib/core/styles/snackbar.scss +++ b/lib/core/styles/snackbar.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-snackbar-theme($theme) { $warn: map-get($theme, warn); $accent: map-get($theme, accent); diff --git a/lib/core/templates/empty-content/empty-content.component.scss b/lib/core/templates/empty-content/empty-content.component.scss index cb60db026c..e6c6edbef0 100644 --- a/lib/core/templates/empty-content/empty-content.component.scss +++ b/lib/core/templates/empty-content/empty-content.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-empty-content-theme($theme) { $config: mat-typography-config(); diff --git a/lib/core/templates/empty-content/empty-content.component.ts b/lib/core/templates/empty-content/empty-content.component.ts index a8c099a700..09a12dae21 100644 --- a/lib/core/templates/empty-content/empty-content.component.ts +++ b/lib/core/templates/empty-content/empty-content.component.ts @@ -20,7 +20,6 @@ import { Component, ChangeDetectionStrategy, ViewEncapsulation, Input } from '@a @Component({ selector: 'adf-empty-content', templateUrl: './empty-content.component.html', - styleUrls: ['./empty-content.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, host: { class: 'adf-empty-content' } diff --git a/lib/core/templates/error-content/error-content.component.scss b/lib/core/templates/error-content/error-content.component.scss index 21a20416c4..d5c03d2276 100644 --- a/lib/core/templates/error-content/error-content.component.scss +++ b/lib/core/templates/error-content/error-content.component.scss @@ -1,8 +1,4 @@ -@import '~@angular/material/theming'; - @mixin adf-error-content-theme($theme) { - - $primary: map-get($theme, primary); $foreground: map-get($theme, foreground); .adf-error-content { @@ -44,7 +40,7 @@ } } - @media screen and ($mat-small) { + @media screen and (max-width: 959px) { .adf-error-content { &-code { diff --git a/lib/core/templates/error-content/error-content.component.ts b/lib/core/templates/error-content/error-content.component.ts index c0f4698539..b552dfcddf 100644 --- a/lib/core/templates/error-content/error-content.component.ts +++ b/lib/core/templates/error-content/error-content.component.ts @@ -27,7 +27,6 @@ import { TranslationService } from '../../services/translation.service'; @Component({ selector: 'adf-error-content', templateUrl: './error-content.component.html', - styleUrls: ['./error-content.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, host: { class: 'adf-error-content' } diff --git a/lib/core/toolbar/toolbar.component.scss b/lib/core/toolbar/toolbar.component.scss index 663c502345..1f85cb8d6a 100644 --- a/lib/core/toolbar/toolbar.component.scss +++ b/lib/core/toolbar/toolbar.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-toolbar-theme($theme) { $foreground: map-get($theme, foreground); $adf-toolbar-height: 48px !default; diff --git a/lib/core/toolbar/toolbar.component.ts b/lib/core/toolbar/toolbar.component.ts index 79bd5fd225..831efda48f 100644 --- a/lib/core/toolbar/toolbar.component.ts +++ b/lib/core/toolbar/toolbar.component.ts @@ -21,7 +21,6 @@ import { ThemePalette } from '@angular/material/core'; @Component({ selector: 'adf-toolbar', templateUrl: './toolbar.component.html', - styleUrls: ['./toolbar.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, host: { 'class': 'adf-toolbar' } diff --git a/lib/core/userinfo/components/user-info.component.scss b/lib/core/userinfo/components/user-info.component.scss index 107bf5abdd..2a1a48ae3e 100644 --- a/lib/core/userinfo/components/user-info.component.scss +++ b/lib/core/userinfo/components/user-info.component.scss @@ -1,10 +1,5 @@ -@import '~@angular/material/theming'; - @mixin adf-userinfo-theme($theme) { $primary: map-get($theme, primary); - $accent: map-get($theme, accent); - $warn: map-get($theme, warn); - $foreground: map-get($theme, foreground); .adf { @@ -21,7 +16,7 @@ &-userinfo-name { padding: 0 5px; - @media screen and ($mat-small) { + @media screen and (max-width: 959px) { display: none; } } @@ -105,7 +100,7 @@ display: flex; justify-content: space-between; - @media screen and ($mat-xsmall) { + @media screen and (max-width: 599px) { padding: 10px; } } diff --git a/lib/core/userinfo/components/user-info.component.ts b/lib/core/userinfo/components/user-info.component.ts index 2d253b1d85..8b4d47283c 100644 --- a/lib/core/userinfo/components/user-info.component.ts +++ b/lib/core/userinfo/components/user-info.component.ts @@ -28,7 +28,6 @@ import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/ @Component({ selector: 'adf-userinfo', - styleUrls: ['./user-info.component.scss'], templateUrl: './user-info.component.html', encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/viewer/components/img-viewer.component.scss b/lib/core/viewer/components/img-viewer.component.scss index d782c2f439..e702b6b5e6 100644 --- a/lib/core/viewer/components/img-viewer.component.scss +++ b/lib/core/viewer/components/img-viewer.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-image-viewer-theme($theme) { $background: map-get($theme, background); $viewer-image-outline: 1px solid mat-color($alfresco-ecm-blue, A200) !default; diff --git a/lib/core/viewer/components/img-viewer.component.ts b/lib/core/viewer/components/img-viewer.component.ts index fe9353a213..54e82416d8 100644 --- a/lib/core/viewer/components/img-viewer.component.ts +++ b/lib/core/viewer/components/img-viewer.component.ts @@ -32,7 +32,6 @@ import Cropper from 'cropperjs'; @Component({ selector: 'adf-img-viewer', templateUrl: './img-viewer.component.html', - styleUrls: ['./img-viewer.component.scss'], host: { 'class': 'adf-image-viewer' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/viewer/components/pdf-viewer-password-dialog.scss b/lib/core/viewer/components/pdf-viewer-password-dialog.scss index b6afe8e89c..a9870fd562 100644 --- a/lib/core/viewer/components/pdf-viewer-password-dialog.scss +++ b/lib/core/viewer/components/pdf-viewer-password-dialog.scss @@ -1,14 +1,11 @@ -@import '~@angular/material/theming'; - -.adf-fill-remaining-space { - flex: 1 1 auto; -} - -.adf-full-width { - width: 100%; -} - @mixin adf-dialog-theme($theme) { + .adf-fill-remaining-space { + flex: 1 1 auto; + } + + .adf-full-width { + width: 100%; + } $primary: map-get($theme, primary); @@ -19,5 +16,4 @@ .adf-dialog-action-button:enabled { color: mat-color($primary); } - } diff --git a/lib/core/viewer/components/pdf-viewer-thumbnails.component.scss b/lib/core/viewer/components/pdf-viewer-thumbnails.component.scss index c5eb79dab4..e54d18c5ff 100644 --- a/lib/core/viewer/components/pdf-viewer-thumbnails.component.scss +++ b/lib/core/viewer/components/pdf-viewer-thumbnails.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-pdf-thumbnails-theme($theme) { $background: map-get($theme, background); diff --git a/lib/core/viewer/components/pdf-viewer-thumbnails.component.ts b/lib/core/viewer/components/pdf-viewer-thumbnails.component.ts index 4442d01862..e664bf4cef 100644 --- a/lib/core/viewer/components/pdf-viewer-thumbnails.component.ts +++ b/lib/core/viewer/components/pdf-viewer-thumbnails.component.ts @@ -28,7 +28,6 @@ import { delay } from 'rxjs/operators'; @Component({ selector: 'adf-pdf-thumbnails', templateUrl: './pdf-viewer-thumbnails.component.html', - styleUrls: ['./pdf-viewer-thumbnails.component.scss'], host: { class: 'adf-pdf-thumbnails' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/viewer/components/pdf-viewer.component.scss b/lib/core/viewer/components/pdf-viewer.component.scss index 0edff0ac25..1abf2ec5f4 100644 --- a/lib/core/viewer/components/pdf-viewer.component.scss +++ b/lib/core/viewer/components/pdf-viewer.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-pdf-viewer-theme($theme) { $background: map-get($theme, background); $foreground: map-get($theme, foreground); diff --git a/lib/core/viewer/components/pdf-viewer.component.ts b/lib/core/viewer/components/pdf-viewer.component.ts index 9ed7322294..e2746e890c 100644 --- a/lib/core/viewer/components/pdf-viewer.component.ts +++ b/lib/core/viewer/components/pdf-viewer.component.ts @@ -40,10 +40,7 @@ declare const pdfjsViewer: any; @Component({ selector: 'adf-pdf-viewer', templateUrl: './pdf-viewer.component.html', - styleUrls: [ - './pdf-viewer.component.scss', - './pdf-viewer-host.component.scss' - ], + styleUrls: ['./pdf-viewer-host.component.scss'], providers: [RenderingQueueServices], host: { 'class': 'adf-pdf-viewer' }, encapsulation: ViewEncapsulation.None diff --git a/lib/core/viewer/components/txt-viewer.component.scss b/lib/core/viewer/components/txt-viewer.component.scss index 32268bc843..cff0395612 100644 --- a/lib/core/viewer/components/txt-viewer.component.scss +++ b/lib/core/viewer/components/txt-viewer.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-text-viewer-theme($theme) { $background: map-get($theme, background); diff --git a/lib/core/viewer/components/txt-viewer.component.ts b/lib/core/viewer/components/txt-viewer.component.ts index 63c51250b6..8477b57529 100644 --- a/lib/core/viewer/components/txt-viewer.component.ts +++ b/lib/core/viewer/components/txt-viewer.component.ts @@ -22,7 +22,6 @@ import { AppConfigService } from './../../app-config/app-config.service'; @Component({ selector: 'adf-txt-viewer', templateUrl: './txt-viewer.component.html', - styleUrls: ['./txt-viewer.component.scss'], host: { 'class': 'adf-txt-viewer' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/viewer/components/unknown-format/unknown-format.component.scss b/lib/core/viewer/components/unknown-format/unknown-format.component.scss index f4c2680d82..6f5fc3123c 100644 --- a/lib/core/viewer/components/unknown-format/unknown-format.component.scss +++ b/lib/core/viewer/components/unknown-format/unknown-format.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-unknown-viewer-theme($theme) { $foreground: map-get($theme, foreground); diff --git a/lib/core/viewer/components/unknown-format/unknown-format.component.ts b/lib/core/viewer/components/unknown-format/unknown-format.component.ts index 2b5c720ac3..4523b4cd90 100644 --- a/lib/core/viewer/components/unknown-format/unknown-format.component.ts +++ b/lib/core/viewer/components/unknown-format/unknown-format.component.ts @@ -19,8 +19,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'adf-viewer-unknown-format', - templateUrl: 'unknown-format.component.html', - styleUrls: ['unknown-format.component.scss'] + templateUrl: './unknown-format.component.html' }) export class UnknownFormatComponent { } diff --git a/lib/core/viewer/components/viewer.component.scss b/lib/core/viewer/components/viewer.component.scss index 5409da5bc5..6937f3f370 100644 --- a/lib/core/viewer/components/viewer.component.scss +++ b/lib/core/viewer/components/viewer.component.scss @@ -1,5 +1,3 @@ -@import '~@angular/material/theming'; - @mixin adf-viewer-theme($theme) { $background: map-get($theme, background); $foreground: map-get($theme, foreground); diff --git a/lib/core/viewer/components/viewer.component.ts b/lib/core/viewer/components/viewer.component.ts index bd5ddd7bd9..29aba259be 100644 --- a/lib/core/viewer/components/viewer.component.ts +++ b/lib/core/viewer/components/viewer.component.ts @@ -40,7 +40,6 @@ import { FileModel } from '../../models'; @Component({ selector: 'adf-viewer', templateUrl: './viewer.component.html', - styleUrls: ['./viewer.component.scss'], host: { 'class': 'adf-viewer' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts index 0f11447b6f..04dcd87e8b 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts @@ -24,7 +24,6 @@ import { share } from 'rxjs/operators'; @Component({ selector: 'adf-analytics-report-list', templateUrl: './analytics-report-list.component.html', - styleUrls: ['./analytics-report-list.component.scss'], encapsulation: ViewEncapsulation.None }) export class AnalyticsReportListComponent implements OnInit { diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts index 3dc432b43c..4ec5356731 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts @@ -43,7 +43,6 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'adf-analytics-report-parameters', templateUrl: './analytics-report-parameters.component.html', - styleUrls: ['./analytics-report-parameters.component.scss'], encapsulation: ViewEncapsulation.None }) export class AnalyticsReportParametersComponent implements OnInit, OnChanges, OnDestroy, AfterContentChecked { diff --git a/lib/insights/src/lib/analytics-process/components/widgets/date-range/date-range.widget.ts b/lib/insights/src/lib/analytics-process/components/widgets/date-range/date-range.widget.ts index 737201c591..9a16fb7006 100644 --- a/lib/insights/src/lib/analytics-process/components/widgets/date-range/date-range.widget.ts +++ b/lib/insights/src/lib/analytics-process/components/widgets/date-range/date-range.widget.ts @@ -32,7 +32,6 @@ import { takeUntil } from 'rxjs/operators'; providers: [ {provide: DateAdapter, useClass: MomentDateAdapter}, {provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], - styleUrls: ['./date-range.widget.scss'], encapsulation: ViewEncapsulation.None }) export class DateRangeWidgetComponent implements OnInit, OnDestroy { diff --git a/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.scss b/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.scss index 3f3b23be3e..b1a136a193 100644 --- a/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.scss +++ b/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.scss @@ -1,76 +1,73 @@ -@mixin adf-diagram-tooltip-theme($theme) { - - .adf { - &-diagram-tooltip { - transform: scale(0); - transform-origin: top center; - z-index: 999; - display: inline-block; - font-weight: 500; - line-height: 14px; - font-size: 14px; - max-width: 300px; - position: fixed; - top: -500px; - left: -500px; - text-align: left; - will-change: unset; - border: 1px solid #c5c5c5; - word-wrap: break-word; - } - - &-diagram-tooltip.adf-is-active { - animation: tooltipAnimation 200ms cubic-bezier(0, 0, 0.2, 1) forwards; - } - - &-diagram-tooltip-header { - background-color: rgba(43, 65, 79, 0.95); - color: #fff; - padding: 8px; - font-weight: bold; - min-width: 200px; - line-height: 20px; - } - - &-diagram-tooltip-body { - color: #4a4a4a; - background-color: rgba(255, 255, 255, 0.95); - } - - &-diagram-tooltip-body > div { - padding: 4px 8px; - } - - &-diagram-tooltip-body > div:first-child { - padding-top: 8px; - } - - &-diagram-tooltip-body > div:last-child { - padding-bottom: 8px; - } - - &-diagram-propertyName { - font-weight: bold; - margin-right: 5px; - } - - &-diagram-propertyValue { - font-style: italic; - } +.adf { + &-diagram-tooltip { + transform: scale(0); + transform-origin: top center; + z-index: 999; + display: inline-block; + font-weight: 500; + line-height: 14px; + font-size: 14px; + max-width: 300px; + position: fixed; + top: -500px; + left: -500px; + text-align: left; + will-change: unset; + border: 1px solid #c5c5c5; + word-wrap: break-word; } - @keyframes tooltipAnimation { - 0% { - transform: scale(0); - opacity: 0; - } - 50% { - transform: scale(0.99); - } - 100% { - transform: scale(1); - opacity: 1; - visibility: visible; - } + &-diagram-tooltip.adf-is-active { + animation: tooltipAnimation 200ms cubic-bezier(0, 0, 0.2, 1) forwards; + } + + &-diagram-tooltip-header { + background-color: rgba(43, 65, 79, 0.95); + color: #fff; + padding: 8px; + font-weight: bold; + min-width: 200px; + line-height: 20px; + } + + &-diagram-tooltip-body { + color: #4a4a4a; + background-color: rgba(255, 255, 255, 0.95); + } + + &-diagram-tooltip-body > div { + padding: 4px 8px; + } + + &-diagram-tooltip-body > div:first-child { + padding-top: 8px; + } + + &-diagram-tooltip-body > div:last-child { + padding-bottom: 8px; + } + + &-diagram-propertyName { + font-weight: bold; + margin-right: 5px; + } + + &-diagram-propertyValue { + font-style: italic; + } +} + +@keyframes tooltipAnimation { + 0% { + transform: scale(0); + opacity: 0; + } + 50% { + transform: scale(0.99); + } + 100% { + transform: scale(1); + opacity: 1; + visibility: visible; } } diff --git a/lib/insights/src/lib/styles/_index.scss b/lib/insights/src/lib/styles/_index.scss index e915e57fcb..068134ad90 100644 --- a/lib/insights/src/lib/styles/_index.scss +++ b/lib/insights/src/lib/styles/_index.scss @@ -1,10 +1,8 @@ -@import '../diagram/components/tooltip/diagram-tooltip.component'; @import '../analytics-process/components/analytics-report-parameters.component'; @import '../analytics-process/components/analytics-report-list.component'; @import '../analytics-process/components/widgets/date-range/date-range.widget'; @mixin adf-insights-theme($theme) { - @include adf-diagram-tooltip-theme($theme); @include adf-analytics-report-list-theme($theme); @include adf-analytics-date-range-widget-theme($theme); @include adf-analytics-report-parameters-theme($theme); diff --git a/lib/process-services-cloud/src/lib/app/components/app-details-cloud.component.ts b/lib/process-services-cloud/src/lib/app/components/app-details-cloud.component.ts index 4e9d034345..8d3def7f17 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-details-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/app/components/app-details-cloud.component.ts @@ -20,8 +20,7 @@ import { ApplicationInstanceModel, DEFAULT_APP_INSTANCE_ICON, DEFAULT_APP_INSTAN @Component({ selector: 'adf-cloud-app-details', - templateUrl: './app-details-cloud.component.html', - styleUrls: ['./app-details-cloud.component.scss'] + templateUrl: './app-details-cloud.component.html' }) export class AppDetailsCloudComponent { diff --git a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss index 88e1d3b6a6..0e969a6c64 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.scss @@ -1,21 +1,20 @@ -@mixin adf-cloud-app-list-theme($theme) { +:host { + width: 100%; +} - :host { - width: 100%; - } +.adf-app-list-item { + cursor: pointer; +} - .adf-app-list-item { - cursor: pointer; - } - - .adf-app-list-spinner, .adf-app-list-empty, .adf-app-list-error { - display: flex; - align-items: center; - justify-content: center; - flex-direction: column; - height: 85vh; - .mat-spinner { - margin: 0 auto; - } +.adf-app-list-spinner, +.adf-app-list-empty, +.adf-app-list-error { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + height: 85vh; + .mat-spinner { + margin: 0 auto; } } diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts index 15ee9222f9..74aa518ab1 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts @@ -39,7 +39,6 @@ import { ContentNodeSelectorPanelService } from '@alfresco/adf-content-services' @Component({ selector: 'adf-cloud-attach-file-cloud-widget', templateUrl: './attach-file-cloud-widget.component.html', - styleUrls: ['./attach-file-cloud-widget.component.scss'], host: { '(click)': 'event($event)', '(blur)': 'event($event)', diff --git a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts index b19ea53df1..f6eb168c42 100644 --- a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts @@ -40,7 +40,6 @@ import { ComponentSelectionMode } from '../../types'; @Component({ selector: 'adf-cloud-group', templateUrl: './group-cloud.component.html', - styleUrls: ['./group-cloud.component.scss'], animations: [ trigger('transitionMessages', [ state('enter', style({ opacity: 1, transform: 'translateY(0%)' })), diff --git a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts index f3feec5197..2967502407 100644 --- a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts @@ -43,7 +43,6 @@ import { ComponentSelectionMode } from '../../types'; @Component({ selector: 'adf-cloud-people', templateUrl: './people-cloud.component.html', - styleUrls: ['./people-cloud.component.scss'], animations: [ trigger('transitionMessages', [ state('enter', style({ opacity: 1, transform: 'translateY(0%)' })), diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts index b361aee329..bc1d9eac55 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts @@ -38,8 +38,7 @@ export interface DropdownOption { @Component({ selector: 'adf-cloud-edit-process-filter', - templateUrl: './edit-process-filter-cloud.component.html', - styleUrls: ['./edit-process-filter-cloud.component.scss'] + templateUrl: './edit-process-filter-cloud.component.html' }) export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDestroy { diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts index fc3d5683cf..a805ef75f1 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts @@ -25,8 +25,7 @@ import { takeUntil } from 'rxjs/operators'; @Component({ selector: 'adf-cloud-process-filters', - templateUrl: './process-filters-cloud.component.html', - styleUrls: ['process-filters-cloud.component.scss'] + templateUrl: './process-filters-cloud.component.html' }) export class ProcessFiltersCloudComponent implements OnInit, OnChanges, OnDestroy { diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.scss b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.scss index 7a41730a76..bee9fd39d9 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.scss @@ -1,19 +1,13 @@ -@mixin adf-cloud-process-filters-theme($theme) { - - .adf { - - &-cloud-process-list-loading-margin { - margin-left: calc((100% - 100px) / 2); - margin-right: calc((100% - 100px) / 2); - } - } - - - .adf-no-content-message { - font-size: 16px; - font-weight: bold; - text-align: center; - opacity: 0.54; +.adf { + &-cloud-process-list-loading-margin { + margin-left: calc((100% - 100px) / 2); + margin-right: calc((100% - 100px) / 2); } } +.adf-no-content-message { + font-size: 16px; + font-weight: bold; + text-align: center; + opacity: 0.54; +} diff --git a/lib/process-services-cloud/src/lib/styles/_index.scss b/lib/process-services-cloud/src/lib/styles/_index.scss index 9acaec92d5..9a782e1921 100644 --- a/lib/process-services-cloud/src/lib/styles/_index.scss +++ b/lib/process-services-cloud/src/lib/styles/_index.scss @@ -1,8 +1,6 @@ @import './../app/components/app-details-cloud.component'; -@import './../app/components/app-list-cloud.component'; @import './../group/components/group-cloud.component'; @import './../people/components/people-cloud.component.scss'; -@import './../process/process-list/components/process-list-cloud.component.scss'; @import './../process/process-filters/components/edit-process-filter-cloud.component.scss'; @import './../task/task-form/components/task-form-cloud.component'; @import './../task/start-task/components/start-task-cloud.component.scss'; @@ -13,12 +11,10 @@ @mixin adf-process-services-cloud-theme($theme) { - @include adf-cloud-app-list-theme($theme); @include adf-cloud-app-details-theme($theme); @include adf-cloud-task-filters-theme($theme); @include adf-cloud-edit-task-filters-theme($theme); @include adf-cloud-edit-process-filter-theme($theme); - @include adf-cloud-process-filters-theme($theme); @include adf-cloud-start-task-theme($theme); @include adf-cloud-people-theme($theme); @include adf-cloud-group-theme($theme); diff --git a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss index 7cc746fe93..405f4f868b 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss @@ -1,6 +1,4 @@ @mixin adf-cloud-start-task-theme($theme) { - $primary: map-get($theme, primary); - $accent: map-get($theme, accent); $warn: map-get($theme, warn); $foreground: map-get($theme, foreground); $header-border: 1px solid mat-color($foreground, divider); diff --git a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.ts b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.ts index bee192969e..cef768b10a 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.ts @@ -38,7 +38,6 @@ import { TaskPriorityOption } from '../../models/task.model'; @Component({ selector: 'adf-cloud-start-task', templateUrl: './start-task-cloud.component.html', - styleUrls: ['./start-task-cloud.component.scss'], providers: [ { provide: DateAdapter, useClass: MomentDateAdapter }, { provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS }], diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.ts index 85372f8283..c18e15dc93 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.ts @@ -32,8 +32,7 @@ import { BaseEditTaskFilterCloudComponent, DropdownOption } from './base-edit-ta @Component({ selector: 'adf-cloud-edit-service-task-filter', - templateUrl: './base-edit-task-filter-cloud.component.html', - styleUrls: ['./base-edit-task-filter-cloud.component.scss'] + templateUrl: './base-edit-task-filter-cloud.component.html' }) export class EditServiceTaskFilterCloudComponent extends BaseEditTaskFilterCloudComponent { constructor( diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.ts index 19ea2b2849..774a021897 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.ts @@ -34,8 +34,7 @@ import { BaseEditTaskFilterCloudComponent, DropdownOption } from './base-edit-ta @Component({ selector: 'adf-cloud-edit-task-filter', - templateUrl: './base-edit-task-filter-cloud.component.html', - styleUrls: ['./base-edit-task-filter-cloud.component.scss'] + templateUrl: './base-edit-task-filter-cloud.component.html' }) export class EditTaskFilterCloudComponent extends BaseEditTaskFilterCloudComponent { constructor( diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.ts index 1f43425367..0417445b26 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.ts @@ -25,8 +25,7 @@ import { ServiceTaskFilterCloudService } from '../services/service-task-filter-c @Component({ selector: 'adf-cloud-service-task-filters', - templateUrl: './base-task-filters-cloud.component.html', - styleUrls: ['base-task-filters-cloud.component.scss'] + templateUrl: './base-task-filters-cloud.component.html' }) export class ServiceTaskFiltersCloudComponent extends BaseTaskFiltersCloudComponent implements OnInit, OnChanges { diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts index b49e8441f4..c7dc5c584d 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts @@ -27,8 +27,7 @@ import { TaskCloudEngineEvent } from '../../../models/engine-event-cloud.model'; @Component({ selector: 'adf-cloud-task-filters', - templateUrl: './base-task-filters-cloud.component.html', - styleUrls: ['base-task-filters-cloud.component.scss'] + templateUrl: './base-task-filters-cloud.component.html' }) export class TaskFiltersCloudComponent extends BaseTaskFiltersCloudComponent implements OnInit, OnChanges { diff --git a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts index 6afca55e11..afd30c38bf 100644 --- a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts @@ -28,8 +28,7 @@ import { DateCloudWidgetComponent } from '../../../form/components/widgets/date/ @Component({ selector: 'adf-cloud-task-form', - templateUrl: './task-form-cloud.component.html', - styleUrls: ['./task-form-cloud.component.scss'] + templateUrl: './task-form-cloud.component.html' }) export class TaskFormCloudComponent implements OnInit, OnChanges { diff --git a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.scss b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.scss index 8da05a7e79..0c9d0b7445 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.scss +++ b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.scss @@ -29,7 +29,7 @@ } } - @media screen and ($mat-small) { + @media screen and (max-width: 959px) { adf-card-view .adf-property-value { text-overflow: ellipsis; overflow: hidden; diff --git a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.ts index 83615b0c5c..2a53284a84 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.ts @@ -37,8 +37,7 @@ import { TaskCloudService } from '../../services/task-cloud.service'; @Component({ selector: 'adf-cloud-task-header', - templateUrl: './task-header-cloud.component.html', - styleUrls: ['./task-header-cloud.component.scss'] + templateUrl: './task-header-cloud.component.html' }) export class TaskHeaderCloudComponent implements OnInit, OnDestroy, OnChanges { diff --git a/lib/process-services/src/lib/app-list/apps-list.component.ts b/lib/process-services/src/lib/app-list/apps-list.component.ts index 6d3a61c39a..31a303aa0a 100644 --- a/lib/process-services/src/lib/app-list/apps-list.component.ts +++ b/lib/process-services/src/lib/app-list/apps-list.component.ts @@ -24,8 +24,7 @@ import { share, takeUntil, finalize } from 'rxjs/operators'; @Component({ selector: 'adf-apps', - templateUrl: 'apps-list.component.html', - styleUrls: ['./apps-list.component.scss'] + templateUrl: './apps-list.component.html' }) export class AppsListComponent implements OnInit, AfterContentInit, OnDestroy { diff --git a/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts b/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts index aa98335ada..43e2a37d58 100644 --- a/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts +++ b/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts @@ -21,7 +21,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'adf-select-apps-dialog', - templateUrl: 'select-apps-dialog.component.html' + templateUrl: './select-apps-dialog.component.html' }) export class SelectAppsDialogComponent { diff --git a/lib/process-services/src/lib/attachment/process-attachment-list.component.scss b/lib/process-services/src/lib/attachment/process-attachment-list.component.scss index 19f733be9c..8038285b15 100644 --- a/lib/process-services/src/lib/attachment/process-attachment-list.component.scss +++ b/lib/process-services/src/lib/attachment/process-attachment-list.component.scss @@ -1,52 +1,49 @@ -@mixin adf-process-attachment-list-theme($theme) { +.adf-data-cell { + cursor: pointer !important; +} - .adf-data-cell { - cursor: pointer !important; - } +.adf-attachment-list-loading-margin { + margin-left: calc((100% - 100px) / 2); + margin-right: calc((100% - 100px) / 2); +} - .adf-attachment-list-loading-margin { - margin-left: calc((100% - 100px) / 2); - margin-right: calc((100% - 100px) / 2); - } +.adf-empty-list-header { + height: 32px; + opacity: 0.26 !important; + font-size: 24px; + line-height: 1.33; + letter-spacing: -1px; +} - .adf-empty-list-header { - height: 32px; - opacity: 0.26 !important; - font-size: 24px; - line-height: 1.33; - letter-spacing: -1px; - } +.adf-empty-list-drag_drop { + min-height: 56px; + opacity: 0.54; + font-size: 56px; + line-height: 1; + letter-spacing: -2px; + margin-top: 40px !important; + word-break: break-all; + white-space: pre-line; +} - .adf-empty-list-drag_drop { - min-height: 56px; - opacity: 0.54; - font-size: 56px; - line-height: 1; - letter-spacing: -2px; - margin-top: 40px !important; - word-break: break-all; - white-space: pre-line; - } +.adf-empty-list__any-files-here-to-add { + min-height: 24px; + opacity: 0.54; + font-size: 16px; + line-height: 1.5; + letter-spacing: -0.4px; + margin-top: 17px; + word-break: break-all; + white-space: pre-line; +} - .adf-empty-list__any-files-here-to-add { - min-height: 24px; - opacity: 0.54; - font-size: 16px; - line-height: 1.5; - letter-spacing: -0.4px; - margin-top: 17px; - word-break: break-all; - white-space: pre-line; - } +.adf-empty-list__empty_doc_lib { + width: 565px; + height: 161px; + object-fit: contain; + margin-top: 17px; - .adf-empty-list__empty_doc_lib { - width: 565px; - height: 161px; - object-fit: contain; - margin-top: 17px; - - @media screen and ($mat-xsmall) { - width: 250px; - } + @media screen and (max-width: 599px) { + width: 250px; } } diff --git a/lib/process-services/src/lib/attachment/task-attachment-list.component.scss b/lib/process-services/src/lib/attachment/task-attachment-list.component.scss index fe8e726710..485191752a 100644 --- a/lib/process-services/src/lib/attachment/task-attachment-list.component.scss +++ b/lib/process-services/src/lib/attachment/task-attachment-list.component.scss @@ -1,58 +1,54 @@ -@mixin adf-task-attachment-list-theme($theme) { +adf-datatable .adf-data-cell { + cursor: pointer !important; +} +.adf-attachment-list-loading-margin { + margin-left: calc((100% - 100px) / 2); + margin-right: calc((100% - 100px) / 2); +} - adf-datatable .adf-data-cell { - cursor: pointer !important; - } +.adf-empty-list-header { + height: 32px; + opacity: 0.26; + font-size: 24px; + line-height: 1.33; + letter-spacing: -1px; +} - .adf-attachment-list-loading-margin { - margin-left: calc((100% - 100px) / 2); - margin-right: calc((100% - 100px) / 2); - } +.adf-empty-list-drag_drop { + min-height: 56px; + opacity: 0.54; + font-size: 56px; + line-height: 1; + letter-spacing: -2px; + margin-top: 40px; + word-break: break-all; + white-space: pre-line; - .adf-empty-list-header { - height: 32px; - opacity: 0.26; - font-size: 24px; - line-height: 1.33; - letter-spacing: -1px; - } - - .adf-empty-list-drag_drop { - min-height: 56px; - opacity: 0.54; - font-size: 56px; - line-height: 1; - letter-spacing: -2px; - margin-top: 40px; - word-break: break-all; - white-space: pre-line; - - @media screen and ($mat-xsmall) { - font-size: 40px; - } - } - - .adf-empty-list__any-files-here-to-add { - min-height: 24px; - opacity: 0.54; - font-size: 16px; - line-height: 1.5; - letter-spacing: -0.4px; - margin-top: 17px; - word-break: break-all; - white-space: pre-line; - } - - .adf-empty-list__empty_doc_lib { - width: 565px; - max-width: 100%; - height: 161px; - object-fit: contain; - margin-top: 17px; - - @media screen and ($mat-xsmall) { - width: 250px; - } + @media screen and (max-width: 599px) { + font-size: 40px; + } +} + +.adf-empty-list__any-files-here-to-add { + min-height: 24px; + opacity: 0.54; + font-size: 16px; + line-height: 1.5; + letter-spacing: -0.4px; + margin-top: 17px; + word-break: break-all; + white-space: pre-line; +} + +.adf-empty-list__empty_doc_lib { + width: 565px; + max-width: 100%; + height: 161px; + object-fit: contain; + margin-top: 17px; + + @media screen and (max-width: 599px) { + width: 250px; } } diff --git a/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.ts b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.ts index 9cef5a4e2c..4546d3d2e7 100644 --- a/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.ts +++ b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.ts @@ -25,7 +25,6 @@ import { Node } from '@alfresco/js-api'; @Component({ selector: 'adf-attach-file-widget-dialog', templateUrl: './attach-file-widget-dialog.component.html', - styleUrls: ['./attach-file-widget-dialog.component.scss'], encapsulation: ViewEncapsulation.None, providers: [ AuthenticationService, diff --git a/lib/process-services/src/lib/form/start-form.component.ts b/lib/process-services/src/lib/form/start-form.component.ts index bbc29b256c..e16673dcf5 100644 --- a/lib/process-services/src/lib/form/start-form.component.ts +++ b/lib/process-services/src/lib/form/start-form.component.ts @@ -34,7 +34,6 @@ import { ContentLinkModel, FormService, WidgetVisibilityService, FormOutcomeMode @Component({ selector: 'adf-start-form', templateUrl: './start-form.component.html', - styleUrls: ['./start-form.component.scss'], encapsulation: ViewEncapsulation.None }) export class StartFormComponent extends FormComponent implements OnChanges, OnInit, OnDestroy { diff --git a/lib/process-services/src/lib/people/components/people-list/people-list.component.scss b/lib/process-services/src/lib/people/components/people-list/people-list.component.scss index 25aa66a3c8..f94ace5862 100644 --- a/lib/process-services/src/lib/people/components/people-list/people-list.component.scss +++ b/lib/process-services/src/lib/people/components/people-list/people-list.component.scss @@ -1,9 +1,5 @@ -@mixin adf-task-people-list-theme($theme) { - - .adf-task-people-list { - .adf-datatable-list { - width: 100%; - } +.adf-task-people-list { + .adf-datatable-list { + width: 100%; } - } diff --git a/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts index 4bd3fc8031..b71622bb03 100644 --- a/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts +++ b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts @@ -26,7 +26,6 @@ import { getDisplayUser } from '../../helpers/get-display-user'; @Component({ selector: 'adf-people-search-field', templateUrl: './people-search-field.component.html', - styleUrls: ['./people-search-field.component.scss'], host: { 'class': 'adf-people-search-field' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/process-services/src/lib/people/components/people-search/people-search.component.ts b/lib/process-services/src/lib/people/components/people-search/people-search.component.ts index 0df384017f..37fd9e8206 100644 --- a/lib/process-services/src/lib/people/components/people-search/people-search.component.ts +++ b/lib/process-services/src/lib/people/components/people-search/people-search.component.ts @@ -24,7 +24,6 @@ import { map } from 'rxjs/operators'; @Component({ selector: 'adf-people-search', templateUrl: './people-search.component.html', - styleUrls: ['./people-search.component.scss'], host: { 'class': 'adf-people-search' }, diff --git a/lib/process-services/src/lib/people/components/people-selector/people-selector.component.scss b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.scss index 5127deffe2..78944cd3b6 100644 --- a/lib/process-services/src/lib/people/components/people-selector/people-selector.component.scss +++ b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.scss @@ -1,21 +1,15 @@ -@mixin adf-task-list-people-selector-theme($theme) { - $primary: map-get($theme, primary); - $accent: map-get($theme, accent); - $warn: map-get($theme, warn); +.adf-people-selector { + display: flex; + flex-flow: row; + justify-content: space-between; - .adf-people-selector { - display: flex; - flex-flow: row; - justify-content: space-between; + &-field { + flex: 1 1 auto; + } - &-field { - flex: 1 1 auto; - } - - &-deselect { - flex: 0 0 auto; - top: 5px; - right: 5px; - } + &-deselect { + flex: 0 0 auto; + top: 5px; + right: 5px; } } diff --git a/lib/process-services/src/lib/people/components/people/people.component.ts b/lib/process-services/src/lib/people/components/people/people.component.ts index dd564b41aa..bb1959560e 100644 --- a/lib/process-services/src/lib/people/components/people/people.component.ts +++ b/lib/process-services/src/lib/people/components/people/people.component.ts @@ -24,8 +24,7 @@ import { share } from 'rxjs/operators'; @Component({ selector: 'adf-people', - templateUrl: './people.component.html', - styleUrls: ['./people.component.scss'] + templateUrl: './people.component.html' }) export class PeopleComponent { diff --git a/lib/process-services/src/lib/people/people.module.scss b/lib/process-services/src/lib/people/people.module.scss index 31dffc3990..b534211403 100644 --- a/lib/process-services/src/lib/people/people.module.scss +++ b/lib/process-services/src/lib/people/people.module.scss @@ -1,13 +1,9 @@ @import './components/people-search/people-search.component'; @import './components/people-search-field/people-search-field.component'; @import './components/people/people.component'; -@import './components/people-selector/people-selector.component'; -@import './components/people-list/people-list.component'; @mixin adf-people-module-theme($theme) { - @include adf-task-list-people-selector-theme($theme); @include adf-task-list-people-search-theme($theme); @include adf-task-list-people-search-field-theme($theme); @include adf-task-list-people-theme($theme); - @include adf-task-people-list-theme($theme); } diff --git a/lib/process-services/src/lib/process-comments/process-comments.component.ts b/lib/process-services/src/lib/process-comments/process-comments.component.ts index c4c1a0259e..e472befb51 100644 --- a/lib/process-services/src/lib/process-comments/process-comments.component.ts +++ b/lib/process-services/src/lib/process-comments/process-comments.component.ts @@ -22,8 +22,7 @@ import { share, takeUntil } from 'rxjs/operators'; @Component({ selector: 'adf-process-instance-comments', - templateUrl: './process-comments.component.html', - styleUrls: ['./process-comments.component.scss'] + templateUrl: './process-comments.component.html' }) export class ProcessCommentsComponent implements OnChanges, OnDestroy { diff --git a/lib/process-services/src/lib/process-list/components/process-filters.component.ts b/lib/process-services/src/lib/process-list/components/process-filters.component.ts index 767b40977a..ee35f6a869 100644 --- a/lib/process-services/src/lib/process-list/components/process-filters.component.ts +++ b/lib/process-services/src/lib/process-list/components/process-filters.component.ts @@ -25,8 +25,7 @@ import { IconModel } from '../../app-list/icon.model'; @Component({ selector: 'adf-process-instance-filters', - templateUrl: './process-filters.component.html', - styleUrls: ['process-filters.component.scss'] + templateUrl: './process-filters.component.html' }) export class ProcessFiltersComponent implements OnInit, OnChanges { diff --git a/lib/process-services/src/lib/styles/_index.scss b/lib/process-services/src/lib/styles/_index.scss index 41893e597e..e433c27751 100644 --- a/lib/process-services/src/lib/styles/_index.scss +++ b/lib/process-services/src/lib/styles/_index.scss @@ -1,6 +1,4 @@ @import '../process-list/components/process-filters.component'; -@import '../attachment/process-attachment-list.component'; -@import '../attachment/task-attachment-list.component'; @import '../process-comments/process-comments.component'; @import '../people/people.module'; @import '../task-list/components/start-task.component'; @@ -20,8 +18,6 @@ @include adf-people-module-theme($theme); @include adf-task-list-filters-task-theme($theme); @include adf-task-list-header-theme($theme); - @include adf-process-attachment-list-theme($theme); - @include adf-task-attachment-list-theme($theme); @include adf-apps-theme($theme); @include adf-task-standalone-component-theme($theme); @include adf-attach-file-widget-dialog-component-theme($theme); diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.ts b/lib/process-services/src/lib/task-list/components/start-task.component.ts index 605c54d688..ba8b8f7f67 100644 --- a/lib/process-services/src/lib/task-list/components/start-task.component.ts +++ b/lib/process-services/src/lib/task-list/components/start-task.component.ts @@ -33,7 +33,6 @@ import { FormBuilder, AbstractControl, Validators, FormGroup, FormControl } from @Component({ selector: 'adf-start-task', templateUrl: './start-task.component.html', - styleUrls: ['./start-task.component.scss'], providers: [ { provide: DateAdapter, useClass: MomentDateAdapter }, { provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS }], diff --git a/lib/process-services/src/lib/task-list/components/task-filters.component.ts b/lib/process-services/src/lib/task-list/components/task-filters.component.ts index d0c68221c6..7646fac8ab 100644 --- a/lib/process-services/src/lib/task-list/components/task-filters.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-filters.component.ts @@ -25,8 +25,7 @@ import { IconModel } from '../../app-list/icon.model'; @Component({ selector: 'adf-task-filters', - templateUrl: './task-filters.component.html', - styleUrls: ['task-filters.component.scss'] + templateUrl: './task-filters.component.html' }) export class TaskFiltersComponent implements OnInit, OnChanges { diff --git a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts index 83117203b1..54213dc465 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts @@ -32,8 +32,7 @@ import { Observable } from 'rxjs'; @Component({ selector: 'adf-task-form', - templateUrl: './task-form.component.html', - styleUrls: ['./task-form.component.scss'] + templateUrl: './task-form.component.html' }) export class TaskFormComponent implements OnInit { diff --git a/lib/process-services/src/lib/task-list/components/task-header.component.scss b/lib/process-services/src/lib/task-list/components/task-header.component.scss index c59023f992..c3150848a1 100644 --- a/lib/process-services/src/lib/task-list/components/task-header.component.scss +++ b/lib/process-services/src/lib/task-list/components/task-header.component.scss @@ -29,7 +29,7 @@ } - @media screen and ($mat-small) { + @media screen and (max-width: 959px) { adf-card-view .adf-property-value { text-overflow: ellipsis; overflow: hidden; diff --git a/lib/process-services/src/lib/task-list/components/task-header.component.ts b/lib/process-services/src/lib/task-list/components/task-header.component.ts index 01551b8ca1..a80130392d 100644 --- a/lib/process-services/src/lib/task-list/components/task-header.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-header.component.ts @@ -32,8 +32,7 @@ import { TaskDescriptionValidator } from '../validators/task-description.validat @Component({ selector: 'adf-task-header', - templateUrl: './task-header.component.html', - styleUrls: ['./task-header.component.scss'] + templateUrl: './task-header.component.html' }) export class TaskHeaderComponent implements OnChanges, OnInit { diff --git a/lib/process-services/src/lib/task-list/components/task-standalone.component.ts b/lib/process-services/src/lib/task-list/components/task-standalone.component.ts index 3da2e79113..73de004ab8 100644 --- a/lib/process-services/src/lib/task-list/components/task-standalone.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-standalone.component.ts @@ -20,7 +20,6 @@ import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angu @Component({ selector: 'adf-task-standalone', templateUrl: './task-standalone.component.html', - styleUrls: ['./task-standalone.component.scss'], encapsulation: ViewEncapsulation.None })