diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss index 4c74c50ee..8b6ee1ac6 100644 --- a/src/app/home/home.page.scss +++ b/src/app/home/home.page.scss @@ -36,7 +36,7 @@ ion-badge {/* */ } -@media only screen and (min-width: 1024px) { +@media only screen and (min-width: 1366px) { ion-tabs.tab .bottoms{ display: none; diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 918a80754..47f4c6f3d 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -458,7 +458,7 @@ export class AgendaPage implements OnInit { }); }); - // this.timelineFilter(this.timelineFilterState); + this.timelineFilter(this.timelineFilterState); this.myCal.update(); this.myCal.loadEvents(); @@ -491,7 +491,7 @@ export class AgendaPage implements OnInit { }); - // this.timelineFilter(this.timelineFilterState); + this.timelineFilter(this.timelineFilterState); this.myCal.update(); this.myCal.loadEvents(); diff --git a/src/app/shared/header-pr/header-pr.page.scss b/src/app/shared/header-pr/header-pr.page.scss index cf8935c63..feafb678e 100644 --- a/src/app/shared/header-pr/header-pr.page.scss +++ b/src/app/shared/header-pr/header-pr.page.scss @@ -1,28 +1,47 @@ -.div-top-header{ - width: 400px; - margin: 0 auto; - background-color: #0782c9; - overflow: auto; - padding-top: 15px; - border: 0!important; +@import '~src/function.scss'; - .div-search{ - font-size: 45px; - float: left; - margin: 0 0 0 10px - } - .div-logo{ - background: transparent; - width: 140px; - margin: 5px 0 0px 71px; - float: left; - } - .div-logo img{ - width: 100%; - } - .div-profile{ - font-size: 45px; - float: right; - margin-right: 10px; - } - } \ No newline at end of file +.div-top-header{ + margin: 0 em(20px); + background-color: #0782c9; + padding-top: em(15px); + border: 0!important; +} + +.div-logo{ + background: transparent; + width: em(140px); + justify-content: center; + display: flex; +} +.div-logo img{ + width: 100%; + margin: 0px auto; +} +.div-profile{ + font-size: 45px; + justify-content: flex-end; + display: flex; +} + +.desktop{ + display: none; +} + +@media only screen and (min-width: 1366px) { + + .mobile{ + display: none !important; + } + .desktop{ + display: block; + } + +} + +.tab{ + height: 65px; +} + +.active{ + border-top: 7px solid white; +} \ No newline at end of file diff --git a/src/app/shared/header-pr/header-pr.page.ts b/src/app/shared/header-pr/header-pr.page.ts index d09241781..2dbde5587 100644 --- a/src/app/shared/header-pr/header-pr.page.ts +++ b/src/app/shared/header-pr/header-pr.page.ts @@ -12,4 +12,8 @@ export class HeaderPrPage implements OnInit { ngOnInit() { } + locationPathname(): string { + return window.location.pathname + } + } diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index f9a8e8635..34e1a1ab2 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -3,18 +3,19 @@
@@ -22,42 +23,42 @@
@@ -21,29 +22,29 @@