- - -
+
-
-
+

Palavras mais pesquisadas

-
+
diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index d5ef5aded..79a489d33 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -200,7 +200,9 @@ ion-slide{ @media only screen and (min-width: 1024px) { - + .advance-search{ + max-width: 47%; + } } @@ -249,4 +251,4 @@ ion-slide{ .swiper-container{ width: 100%; -} \ No newline at end of file +} \ No newline at end of file diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index ad09cccb8..b394d7491 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -346,9 +346,16 @@ export class SearchPage implements OnInit { async openAdvanceSearchSelection() { + let classs; + if( window.innerWidth <= 1024){ + classs = 'modal modal-desktop' + } else { + classs = 'search-desktop-modal search-submodal' + } + const modal = await this.modalController.create({ component: SenderPage, - cssClass: 'modal modal-desktop', + cssClass: classs, componentProps: { } }); @@ -364,9 +371,17 @@ export class SearchPage implements OnInit { async openOrganicEntitySelection(){ + let classs; + if( window.innerWidth <= 1024){ + classs = 'modal modal-desktop' + } else { + classs = 'search-desktop-modal search-submodal' + } + + const modal = await this.modalController.create({ component: OrganicEntityPage, - cssClass: 'modal modal-desktop', + cssClass: classs, componentProps: { } }); @@ -433,7 +448,7 @@ export class SearchPage implements OnInit { componentProps:{ publicationId: publicationId, }, - cssClass: 'publication-detail modal modal-desktop', + cssClass: 'publication-detail modal modal-desktop ', backdropDismiss: false }); diff --git a/src/app/pages/search/sender/sender.page.scss b/src/app/pages/search/sender/sender.page.scss index abda67839..27b075310 100644 --- a/src/app/pages/search/sender/sender.page.scss +++ b/src/app/pages/search/sender/sender.page.scss @@ -27,7 +27,7 @@ margin: 0px; padding-top: 10px; li{ - padding-top: 5px; + padding-top: 10px; padding-bottom: 10px; margin: 0px; padding-bottom: 10px; diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 7457655b9..7b587864e 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -23,6 +23,13 @@ export class HeaderPage implements OnInit { this.profile = profile; } + + router.events.subscribe((val) => { + this.showSearch=false; + this.modalController.dismiss() + }); + + } ngOnInit() { @@ -77,7 +84,7 @@ export class HeaderPage implements OnInit { enterAnimation, leaveAnimation, component: ProfileComponent, - cssClass: 'model profile-modal', + cssClass: 'model profile-modal search-submodal', componentProps: { } }); @@ -91,8 +98,7 @@ export class HeaderPage implements OnInit { async closeSearch(){ - document.querySelectorAll('.search-modal').forEach((e)=>e.remove()) - + this.modalController.dismiss() } /** diff --git a/src/assets/images/eraser-solid.svg b/src/assets/images/eraser-solid.svg new file mode 100644 index 000000000..64273ad02 --- /dev/null +++ b/src/assets/images/eraser-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/global.scss b/src/global.scss index b9faf370f..96c86704f 100644 --- a/src/global.scss +++ b/src/global.scss @@ -296,6 +296,15 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- } } +.search-desktop-modal{ + .modal-wrapper{ + position: absolute; + right: 0px; + height: 100%; + width: 400px; + } +} + .footer-container{ padding: 10px 20px; @@ -337,6 +346,17 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- } } } + + .search-modal{ + ion-backdrop{ + display: none; + } + } + + + .search-submodal{ + background-color: rgb(0 0 0 / 55%); + } }