[ADF-5406] SCSS and HTML template path fixes (#7063)

* remove useless mixin

* fix scss paths

* style fixes

* fix styles

* style fixes

* style fixes

* style fixes

* style fixes

* insights fixes

* css and template path fixes

* bug fixes
This commit is contained in:
Denys Vuika
2021-06-01 09:21:00 +01:00
committed by GitHub
parent 9e0000a307
commit e94b2f99bd
229 changed files with 557 additions and 934 deletions

View File

@@ -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}`;

View File

@@ -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;

View File

@@ -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'
},

View File

@@ -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 }
]

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 }
]

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -3,7 +3,7 @@
margin: 10px !important;
}
@media screen and ($mat-xsmall) {
@media screen and (max-width: 599px) {
.app-container {
margin: 0;
}

View File

@@ -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 }
]

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 }

View File

@@ -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;
}

View File

@@ -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 {

View File

@@ -18,7 +18,7 @@
import { Component, Input } from '@angular/core';
@Component({
templateUrl: 'overlay-viewer.component.html'
templateUrl: './overlay-viewer.component.html'
})
export class OverlayViewerComponent {

View File

@@ -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 {

View File

@@ -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;
}
}

View File

@@ -21,7 +21,7 @@ import { Router } from '@angular/router';
@Component({
selector: 'app-settings',
templateUrl: 'settings.component.html'
templateUrl: './settings.component.html'
})
export class SettingsComponent {

View File

@@ -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' }

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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'}
})

View File

@@ -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 })

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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);

View File

@@ -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);