-
+ @if (!showBreadcrumbs()) {
{{ 'NODE_SELECTOR.SEARCH_RESULTS' | translate }}
-
-
-
+ } @else {
+
+ }
+ @if (showNodeCounter) {
+
+ }
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss
index 02d34c7d03..cb39c9c2a4 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss
@@ -36,74 +36,27 @@ h2.adf-search-results-label {
}
&-document-list-container {
- margin-top: 16px;
width: 100%;
}
&-content {
- #{ms.$mat-input-element} {
- &:focus::placeholder {
- color: var(--theme-primary-color);
- }
- }
-
- #{ms.$mat-form-field-wrapper} {
- #{ms.$mat-form-field-flex} {
- align-items: center;
-
- #{ms.$mat-form-field-infix} {
- padding-bottom: 0;
- }
- }
- }
-
- .adf-sites-dropdown-form-field {
- label {
- {ms.$mat-form-field-label} {
- top: 32px;
- }
- }
- }
-
- #{ms.$mat-form-field-subscript-wrapper} {
- height: 16px;
- }
-
- padding-top: 0;
+ padding-top: 10px;
&-input {
width: 100%;
- margin-bottom: 8px;
+ margin-bottom: 15px;
- .adf-content-node-selector-content-input-icon:is(mat-icon) {
+ .adf-content-node-selector-content-input-icon {
color: var(--adf-theme-foreground-icon-color-054);
- padding: 0 0 8px;
- width: 1em;
- height: 1em;
- font-size: 20px;
}
.adf-content-node-selector-search-clear-button {
- padding: 0;
- width: 20px;
- height: 28px;
-
- &:focus {
- outline-offset: -1.5px;
- }
-
- .adf-content-node-selector-content-input-icon:is(mat-icon) {
- cursor: pointer;
-
+ .adf-content-node-selector-content-input-icon {
&:hover {
color: var(--adf-theme-foreground-base-color);
}
}
}
-
- #{ms.$mat-form-field-subscript-wrapper} {
- display: none;
- }
}
.adf-site-dropdown-container {
@@ -111,6 +64,7 @@ h2.adf-search-results-label {
.adf-sites-dropdown-form-field {
width: 100%;
+ margin-bottom: 15px;
}
}
}
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts
index f238c27f88..663d84885b 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts
@@ -42,7 +42,6 @@ import { ShareDataRow } from '../../document-list/data/share-data-row.model';
import { NodeEntryEvent } from '../../document-list/components/node.event';
import { debounceTime } from 'rxjs/operators';
import { ContentNodeSelectorPanelService } from './content-node-selector-panel.service';
-import { CommonModule } from '@angular/common';
import { MatFormFieldModule } from '@angular/material/form-field';
import { TranslatePipe } from '@ngx-translate/core';
import { MatInputModule } from '@angular/material/input';
@@ -63,7 +62,6 @@ export const defaultValidation = () => true;
@Component({
selector: 'adf-content-node-selector-panel',
imports: [
- CommonModule,
MatFormFieldModule,
TranslatePipe,
MatInputModule,
diff --git a/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.html b/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.html
index dcda55e7e1..21d51694e9 100644
--- a/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.html
+++ b/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.html
@@ -1,5 +1,5 @@
-
+
{{ 'NODE_SELECTOR.LOCATION' | translate }}
-
+ data-automation-id="adf-slide-toggle-checked">
+
{{ 'SHARE.EXPIRATION-PLACEHOLDER' | translate }}
+ matSuffix />
@@ -69,8 +67,6 @@
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss
index 7b6f4ee957..2c068e6e72 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.scss
@@ -1,11 +1,7 @@
-@use '../mat-selectors.scss' as ms;
+@use '@angular/material' as mat;
.adf-share-link-dialog {
.adf-share-link {
- #{ms.$mat-form-field-flex} {
- height: 48px;
- }
-
&__dialog-content {
display: flex;
flex-direction: column;
@@ -34,16 +30,6 @@
&__form {
padding-top: 8px;
-
- #{ms.$mat-form-field-infix}:has(.adf-share-link__input) {
- border-top: 0.9375em solid transparent;
- border-bottom: 0.9375em solid transparent;
- height: 16px;
- }
-
- &--field {
- padding-bottom: 16px;
- }
}
&__public-content {
@@ -56,6 +42,14 @@
font-size: var(--theme-caption-font-size);
}
+ &__border-color {
+ @include mat.form-field-overrides(
+ (
+ outlined-outline-color: var(--theme-warn-color-a700)
+ )
+ );
+ }
+
&--row {
display: flex;
flex-direction: row;
@@ -65,7 +59,7 @@
margin: 8px 0;
&-sharable {
- margin-bottom: 0;
+ margin-bottom: 10px;
}
}
@@ -82,10 +76,6 @@
padding-bottom: 0;
}
- &__input {
- color: var(--adf-theme-foreground-text-color-087);
- }
-
&__separation-line {
border: 1px solid var(--theme-grey-background-color);
margin: 8px -24px;
@@ -96,12 +86,6 @@
margin-left: 12px;
}
- &__icon {
- color: var(--adf-theme-foreground-icon-color-054);
- padding-bottom: 0;
- padding-right: 0;
- }
-
&__para {
margin-top: 8px;
margin-bottom: 8px;
@@ -111,30 +95,6 @@
font-weight: 700;
font-size: var(--theme-subheading-2-font-size);
}
-
- &__copy-icon {
- padding-top: 18px;
- font-size: 22px;
- }
-
- &__calender-icon {
- top: 12px;
- position: relative;
- right: -6px;
-
- svg {
- height: 18px;
- width: 18px;
- }
- }
-
- &__date-time-container {
- padding-bottom: 20px;
- }
-
- &__border-color {
- border: 1px solid var(--theme-warn-color-a700);
- }
}
.adf-input-action {
@@ -143,8 +103,6 @@
.adf-full-width {
width: 100%;
- border-radius: 6px;
- margin-top: -6px;
}
.adf-sharable-link {
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts
index 76c47bc1f5..2c668d2d9b 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts
@@ -305,18 +305,6 @@ describe('ShareDialogComponent', () => {
);
});
- 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(
- 'always'
- );
- });
-
describe('datetimepicker type', () => {
beforeEach(() => {
spyOn(sharedLinksApiService, 'createSharedLinks').and.returnValue(of());
diff --git a/lib/content-services/src/lib/dialogs/folder/folder.dialog.html b/lib/content-services/src/lib/dialogs/folder/folder.dialog.html
index 386f4ee8ff..14b8522ea3 100644
--- a/lib/content-services/src/lib/dialogs/folder/folder.dialog.html
+++ b/lib/content-services/src/lib/dialogs/folder/folder.dialog.html
@@ -4,7 +4,7 @@