diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 4c32025ef..bda24ae27 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -46,12 +46,12 @@ - - ddddddd + + - dddddddd + @@ -109,14 +109,12 @@ - - @@ -164,16 +162,16 @@ - - + + - - + + - + - + {{ TimelineDayEvent(events.key)}} @@ -256,10 +254,10 @@ - + - + {{ TimelineDayEvent(events.key)}} @@ -294,10 +292,10 @@ - + - + {{ TimelineDayEvent(events.key)}} diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 5ed340a03..9228e1166 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -605,8 +605,8 @@ td.monthview-primary-with-event { .timeline-wrapper{ width: 100%; - overflow: scroll; - overflow-x: hidden; + overflow: auto; + // overflow-x: hidden; } } } @@ -698,7 +698,4 @@ app-approve-event{ display: flex; align-items: center; height: 100%; -} - - - +} \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 18745a226..d24fa5631 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -378,6 +378,12 @@ export class AgendaPage implements OnInit { } + get CalendarCurrentDay () { + + console.log(this.viewDate.getDate(), '0_0') + return this.viewDate.getDate() + } + // for timeline timelineIsCurrentDate(): Boolean { return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt'); diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss index 3c073f110..96ecbac6d 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -16,7 +16,6 @@ ion-menu{ .main-header{ font-family: Roboto; background-color: #fff; - overflow:hidden; color:#000; transform: translate3d(0, 1px, 0); @@ -29,7 +28,6 @@ ion-menu{ width: 37px; float: left; font-size: 35px; - overflow: hidden; } .middle{ //width: 230px; @@ -208,7 +206,6 @@ ion-menu{ width: 37px; float: right; font-size: 35px; - overflow: hidden; } } .buttons{ diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 09d8e8fe4..981b159d6 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -50,6 +50,7 @@ export class ApproveEventPage implements OnInit { private animationController: AnimationController, private toastService: ToastService, ) { + this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { this.serialNumber = params["serialNumber"]; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index a9a7fc272..d4e0cca6a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -8,8 +8,8 @@ ion-content{ } :host{ // background: #0782c9; - ion-card-title{ - text-align: center; + ion-card-title { + text-align: center; } .title-container{ padding: 30px 20px 0 20px !important; @@ -81,7 +81,7 @@ ion-content{ /* NEW CSS */ -.main-content{ +.main-content { width: 100%; /* 400px */ height: 100%; font-family: Roboto; diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index a807cb999..61caa66f5 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -77,6 +77,7 @@ export class LoginPage implements OnInit { this.username.trim().length > 0 ); } + validatePassword() { return ( this.password.trim().length > 0 diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 432fd955d..321717fb4 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -50,6 +50,7 @@ export class ApproveEventPage implements OnInit { private animationController: AnimationController ) { // $$$ + } ngOnInit() { diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index a5f496ec9..5202cb708 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -32,7 +32,7 @@ ion-menu{ width: 37px; float: left; font-size: 35px; - overflow: hidden; + } .middle{ padding: 0 0 0 10px !important; @@ -54,7 +54,7 @@ ion-menu{ padding: 1px !important; top: 0 !important; margin: 0 !important; - overflow: hidden; + } .div-icon .edit{ font-size: 35px; diff --git a/src/global.scss b/src/global.scss index 89eead7d3..6ac9e5efb 100644 --- a/src/global.scss +++ b/src/global.scss @@ -747,4 +747,97 @@ ion-icon{ height: fit-content; height: 300px; } -} \ No newline at end of file +} + + + + + + +@media only screen and (min-width: 500px) { + + ::-webkit-scrollbar { + width: 5px; + } + + /* Track */ + ::-webkit-scrollbar-track { + background: #f1f1f1; + border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + -ms-border-radius: 5px; + -o-border-radius: 5px; + } + + /* Handle */ + ::-webkit-scrollbar-thumb { + background: #888; + border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + -ms-border-radius: 5px; + -o-border-radius: 5px; + } + + /* Handle on hover */ + ::-webkit-scrollbar-thumb:hover { + background: rgb(92, 92, 92); + } +} + + + +@media only screen and (min-width: 800px) { + + ::-webkit-scrollbar { + width: 10px; + } + + /* Track */ + ::-webkit-scrollbar-track { + background: #f1f1f1; + border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + -ms-border-radius: 5px; + -o-border-radius: 5px; + } + + /* Handle */ + ::-webkit-scrollbar-thumb { + background: #888; + border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + -ms-border-radius: 5px; + -o-border-radius: 5px; + } + + /* Handle on hover */ + ::-webkit-scrollbar-thumb:hover { + background: rgb(92, 92, 92); + } +} + + + + +.hide-scroll::-webkit-scrollbar { + display: none !important; +} + + /* Track */ +.hide-scroll::-webkit-scrollbar-track { + display: none !important; +} + +/* Handle */ +.hide-scroll::-webkit-scrollbar-thumb { + display: none !important; +} + +/* Handle on hover */ +.hide-scroll::-webkit-scrollbar-thumb:hover { + display: none !important; +} diff --git a/src/style/main.scss b/src/style/main.scss index bced407fd..1549a2300 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -289,9 +289,9 @@ .height-lg-unset{ height: unset !important;} @for $i from 0 through 50 { - .font-lg-#{$i} { - font-size: #{$i}px ; - } + .font-lg-#{$i} { + font-size: #{$i}px ; + } } @for $i from 0 through 10 {