diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.scss b/lib/content-services/src/lib/category/categories-management/categories-management.component.scss index a2675b73476..7b68b772353 100644 --- a/lib/content-services/src/lib/category/categories-management/categories-management.component.scss +++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.scss @@ -1,6 +1,6 @@ .adf-categories-management { padding-top: 12px; - + .adf-category-name-field { display: flex; justify-content: space-between; @@ -26,7 +26,7 @@ .mat-form-field-wrapper { width: 100%; } - + .mat-form-field-appearance-fill .mat-form-field-flex { background: none; } @@ -53,7 +53,6 @@ } .adf-categories-list { - .mat-list-base .mat-list-item, .mat-list-base .mat-list-option { display: flex; diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss index f6ca64e6e28..3a175f79e3a 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss @@ -112,6 +112,12 @@ } } +.app-metadata-tab .adf-metadata-properties .mat-expansion-panel { + border: 1px solid var(--adf-metadata-property-panel-border-color); + border-radius: 12px; + margin-bottom: 12px; +} + .acs-details-container { .mat-tab-body-content { .adf-metadata-properties { @@ -130,9 +136,3 @@ box-shadow: none; } } - -.app-metadata-tab .adf-metadata-properties .mat-expansion-panel { - border: 1px solid var(--adf-metadata-property-panel-border-color); - border-radius: 12px; - margin-bottom: 12px; -} diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts index 31f3512f5f7..d5b39f7cad2 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts @@ -442,9 +442,9 @@ describe('ContentMetadataComponent', () => { expect(component.categoriesPanelState).toBe(true); expect(component.editable).toBe(false); expect(component.editableTags).toBe(false); - }); + }); - it('should toggle group editable', () => { + it('should toggle group editable', () => { const eventMock = new MouseEvent('click'); const group: CardViewGroup = { editable: false, expanded: false, @@ -459,7 +459,7 @@ describe('ContentMetadataComponent', () => { expect(component.editable).toBe(false); expect(component.editableTags).toBe(false); expect(component.editableCategories).toBe(false); - }); + }); }); describe('toggleEditMode', () => { @@ -950,13 +950,9 @@ describe('ContentMetadataComponent', () => { component.displayAspect = 'EXIF'; component.expanded = true; component.displayEmpty = true; - fixture.detectChanges(); await fixture.whenStable(); - let defaultProp = queryDom(fixture); - let exifProp = queryDom(fixture, 'EXIF'); - let customProp = queryDom(fixture, 'CUSTOM'); expect(defaultProp.componentInstance.expanded).toBeFalsy(); component.displayAspect = 'CUSTOM'; @@ -965,23 +961,14 @@ describe('ContentMetadataComponent', () => { await fixture.whenStable(); defaultProp = queryDom(fixture); - exifProp = queryDom(fixture, 'EXIF'); - customProp = queryDom(fixture, 'CUSTOM'); expect(defaultProp.componentInstance.expanded).toBeFalsy(); - expect(exifProp.componentInstance.expanded).toBeFalsy(); - expect(customProp.componentInstance.expanded).toBeTruthy(); - component.displayAspect = 'Properties'; fixture.detectChanges(); await fixture.whenStable(); defaultProp = queryDom(fixture); - exifProp = queryDom(fixture, 'EXIF'); - customProp = queryDom(fixture, 'CUSTOM'); expect(defaultProp.componentInstance.expanded).toBeTruthy(); - expect(exifProp.componentInstance.expanded).toBeFalsy(); - expect(customProp.componentInstance.expanded).toBeFalsy(); }); it('should not expand anything if input is wrong', async () => { diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss index 59b2d795a5c..8825580bce6 100644 --- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss +++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss @@ -39,11 +39,11 @@ adf-tags-creator { padding-right: 3px; font-size: 14px; } - + .mat-form-field-appearance-fill .mat-form-field-flex { background: none; } - + .mat-form-field-appearance-fill .mat-form-field-infix { padding: 0; } @@ -56,7 +56,7 @@ adf-tags-creator { align-items: center; display: flex; padding: 0 12px; - + .mat-form-field-underline { display: none; } diff --git a/stylelint-config.json b/stylelint-config.json index 0294b8e4914..b03133de66e 100644 --- a/stylelint-config.json +++ b/stylelint-config.json @@ -91,7 +91,7 @@ "max-line-length": 240, "linebreaks": "unix", "selector-class-pattern": [ - "^_?(adf|adf-|app|app-|cdk-|example-|demo-|mat-|material-|textLayer|canvasWrapper|page)", + "^_?(adf|adf-|app|app-|cdk-|example-|demo-|mat-|material-|textLayer|canvasWrapper|page|acs)", { "resolveNestedSelectors": true }