Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACS-7531] - Search page #9606

Merged
merged 1 commit into from
Apr 25, 2024
Merged

[ACS-7531] - Search page #9606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ents/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
  {{ displayValue | translate }}
</span>
<ng-template #showAny><span class="adf-search-filter-ellipsis adf-filter-value">&nbsp;{{ 'SEARCH.FILTER.ANY' | translate }}</span></ng-template>
<mat-icon *ngIf="isPopulated; else disabledIcon">{{ chipIcon }}</mat-icon>
<mat-icon class="adf-search-filter-chip-icon" *ngIf="isPopulated; else disabledIcon">{{ chipIcon }}</mat-icon>
<ng-template #disabledIcon>
<mat-icon>remove</mat-icon>
</ng-template>
Expand Down
4 changes: 4 additions & 0 deletions ...ents/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ adf-search-facet-chip-tabbed {
}
}

.adf-search-filter-chip-icon {
padding-top: 2px;
}

.adf-search-widget-extra-width {
max-width: 500px;
}
Expand Down
12 changes: 11 additions & 1 deletion ...services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
@use '@angular/material' as mat;
@import 'styles/mat-selectors';

.adf-search-filter-chip,
.adf-search-filter-chip-tabbed {
border: 2px solid transparent;
transition: border 500ms ease-in-out;
height: 32px;
max-width: 320px;
text-overflow: ellipsis;
overflow: hidden;
Expand Down Expand Up @@ -37,7 +39,6 @@
}

.adf-search-filter-chip-icon {
padding-top: 5px;
padding-left: 5px;
}

Expand All @@ -48,3 +49,12 @@
@include mat.elevation(2);
}
}

.adf-search-filter-chip#{$mat-evolution-chip}#{$mat-standard-chip} {
margin-top: 0;
margin-bottom: 0;
}

#{$mat-standard-chip} {
-webkit-font-smoothing: unset;
}
2 changes: 1 addition & 1 deletion lib/content-services/src/lib/search/components/search-form/search-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
[matMenuTriggerRestoreFocus]="true">

<span class="adf-search-form-title">{{ getSelected(forms) | translate }}</span>
<mat-icon [class.adf-search-form-icon-selected]="menuTrigger.menuOpen" class="adf-search-form-icon">expand_more</mat-icon>
<mat-icon [class.adf-search-form-icon-selected]="menuTrigger.menuOpen" iconPositionEnd class="adf-search-form-icon">expand_more</mat-icon>
</button>

<mat-menu #menu="matMenu" class="adf-search-form-menu">
Expand Down
10 changes: 8 additions & 2 deletions lib/content-services/src/lib/search/components/search-form/search-form.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
@use '@angular/material' as mat;
@import 'styles/mat-selectors';

.adf-search-form {
&.adf-search-form-button {
justify-content: space-between;
display: flex;
padding: 0 14px 0 16px;
height: 35px;
max-width: 190px;
min-width: 190px;
Expand All @@ -17,7 +21,6 @@
&-title {
max-width: 120px;
min-width: 120px;
font-weight: bold;
font-size: var(--theme-body-1-font-size);
line-height: 24px;
padding-right: 12px;
Expand All @@ -26,7 +29,10 @@
text-align: left;
}

&-icon {
.adf-search-form-icon#{$mat-icon} {
font-size: 24px;
height: 24px;
width: 24px;
border: 2px solid transparent;
border-radius: 6px;
transition: border 500ms ease-out;
Expand Down
12 changes: 12 additions & 0 deletions lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import 'styles/mat-selectors';

.adf-dynamic-chip-list-container {
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -72,6 +74,16 @@
background-color: var(--theme-primary-color);
height: auto;
word-break: break-word;
margin-top: 0;
margin-bottom: 0;

#{$mat-evolution-chip-action} {
padding: 2px 12px;

#{$mat-evolution-chip-text-label} {
color: var(--adf-theme-foreground-text-color-054);
}
}
}

.adf-dynamic-chip-list-delete-icon {
Expand Down
4 changes: 4 additions & 0 deletions lib/core/src/lib/styles/_mat-selectors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,7 @@ $mdc-dialog: '.mdc-dialog';
$mat-text-filed-input: '.mdc-text-field__input';
$mat-floating-label-float-above: '.mdc-floating-label--float-above';
$mat-floating-label--required: '.mdc-floating-label--required';
$mat-evolution-chip: '.mdc-evolution-chip';
$mat-standard-chip: '.mat-mdc-standard-chip';
$mat-evolution-chip-action: '.mdc-evolution-chip__action';
$mat-evolution-chip-text-label: '.mdc-evolution-chip__text-label'