inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-6212] Fix overlaping labels and incorrect color for warning (#9219)

Browse Source
This commit is contained in:
AleksanderSklorz
2024-01-18 14:53:15 +01:00
committed by GitHub
parent 7a40a614a4
commit b46d468f76
5 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/content-services/src/lib/content-node-share/content-node-share.dialog.html
View File

@@ -31,7 +31,7 @@
[style.display]="isExpiryDateToggleChecked ? 'block' : 'none'"
data-automation-id="adf-slide-toggle-checked"
class="adf-share-link__date-time-container">
<mat-form-field class="adf-full-width adf-float-label">
<mat-form-field class="adf-full-width" floatLabel="never" data-automation-id="adf-content-share-expiration-field">
<mat-label>{{ 'SHARE.EXPIRATION-PLACEHOLDER' | translate }}</mat-label>
<mat-datepicker-toggle
[disabled]="time.disabled"
@@ -73,7 +73,9 @@
</div>
</div>
<mat-form-field
class="adf-full-width adf-float-label"
class="adf-full-width"
floatLabel="never"
data-automation-id="adf-content-share-public-link-field"
[ngClass]="isLinkWithExpiryDate? 'adf-share-link__border-color' : ''">
<input
#sharedLinkInput

8
lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss
View File

@@ -1,7 +1,3 @@
.adf-float-label {
padding-top: 20px;
}
.adf-share-link-dialog {
.adf-share-link {
&__dialog-content {
@@ -41,7 +37,7 @@
}
&__warn {
color: var(--theme-warn-color);
color: var(--theme-warn-color-a700);
font-size: var(--theme-caption-font-size);
}
@@ -91,7 +87,7 @@
}
&__border-color {
border: 1px solid var(--theme-warn-color);
border: 1px solid var(--theme-warn-color-a700);
}
}

22
lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts
View File

@@ -293,6 +293,28 @@ describe('ShareDialogComponent', () => {
expect(fixture.nativeElement.querySelector('[data-automation-id="adf-slide-toggle-checked"]').style.display).toEqual('none');
});
it('should not display floating label for expiration field', () => {
component.data = {
node,
baseShareUrl: 'some-url/'
};
fixture.detectChanges();
expect(fixture.debugElement.query(By.css('[data-automation-id="adf-content-share-expiration-field"]'))
.componentInstance.floatLabel).toBe('never');
});
it('should not display floating label for public link field', () => {
component.data = {
node,
baseShareUrl: 'some-url/'
};
fixture.detectChanges();
expect(fixture.debugElement.query(By.css('[data-automation-id="adf-content-share-public-link-field"]'))
.componentInstance.floatLabel).toBe('never');
});
describe('datetimepicker type', () => {
beforeEach(() => {
spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(of());