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

Issue #ED-1535 fix: UI is not proper for filter URL #3381

Merged
merged 2 commits into from
Mar 27, 2023
Merged

Issue #ED-1535 fix: UI is not proper for filter URL #3381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90af711
Issue #ED-1535 fix: UI is not proper for filter URL
sujithsojan Mar 27, 2023
5099aa5
Merge branch 'release-5.1.2' into release-5.1.2_ED-1535_c
sujithsojan Mar 27, 2023
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
6 changes: 3 additions & 3 deletions src/app/search/search.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
</ion-list>

<div *ngIf="searchContentResult && searchContentResult.length">
<div class="pills-filter" [ngClass]="{'mt-32': hideSearchOption, '': !hideSearchOption, 'scc-container': searchInfolVisibility === 'show', '':searchInfolVisibility === 'hide'}">
<div class="pills-filter" [ngClass]="{'mt-32': hideSearchOption, '': !hideSearchOption}">
<sb-pills-grid *ngIf="primaryCategoryFilters && primaryCategoryFilters.length" (select)="handleFilterSelect($event)"
[pillsViewType]="PillsViewType.SCROLL"
[pillBorder]="PillBorder.ROUND">
Expand All @@ -193,15 +193,15 @@
</sb-pill-item>
</sb-pills-grid>
</div>
<div class="sb-search-history-entry fixed-counter row" [ngClass]="{'scc-container': searchInfolVisibility === 'show', '':searchInfolVisibility === 'hide'}">
<div class="sb-search-history-entry fixed-counter row" [ngClass]="{'scc-container': searchInfolVisibility === 'hide', 'sbc-container':searchInfolVisibility === 'show'}">
<div class="col" *ngIf="searchKeywords">
{{'SHOWING_RESULT_OUTOF_TOTAL' | translate: {'%count': searchContentResult.length, '%query': totalCount} }}
</div>
<div class="col" *ngIf="!searchKeywords">
{{'RECOMMENDATION_BASED_ON_PROFILE' | translate }}
</div>
</div>
<div [ngClass]="{'scc-container': searchInfolVisibility === 'show', '':searchInfolVisibility === 'hide'}">
<div [ngClass]="{'scc-container':searchInfolVisibility === 'show', 'sbcc-container': searchInfolVisibility === 'hide'}">
<div class="sc-content" *ngFor="let content of searchContentResult; let i = index; let last = last">
<sb-library-card [content]="content" [type]="'mobile_textbook'" [isSelected]="content.selected"
[layoutConfig]="{layout: 'v4'}"
Expand Down
14 changes: 11 additions & 3 deletions src/app/search/search.page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@
.pills-filter {
position: fixed;
z-index: 1;
top: 8.5rem;
top: 6rem;
padding-bottom: 0.5rem;
background-color: var(--app-tertiary-background);
}
Expand All @@ -445,7 +445,7 @@
z-index: 1;
background-color: var(--app-tertiary-background);
width: 100%;
top: 13rem;
top: 9rem;
height: 3rem;
div {
background-color: var(--app-white);
Expand All @@ -460,5 +460,13 @@
}

.fixed-counter + .scc-container {
margin-top: 0rem;
margin-top: 4rem;
}

.pills-filter+ .sbc-container {
margin-top: 6rem;
}

.sb-search-history-entry+ .sbcc-container {
margin-top: 3rem;
}