diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index f62298c2e..7fa578829 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -35,10 +35,8 @@ -
- - -
+ +
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 8976ca2d6..e6d46a248 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -400,7 +400,7 @@ label{ padding: 0px 0px; } -.right-icons{ +.right-icons, .calendar-profile{ padding: 0px 9px } diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 27f035eaa..1dca422d5 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -207,9 +207,9 @@ export class AgendaPage implements OnInit { eventTypeNum = (Object.keys(eventType)).length if (eventTypeNum == 2) { - return 'calendar-event-type-both'; + return `calendar-${this.profile}-event-type-both`; } else { - return 'calendar-event-type-'+(Object.keys(eventType))[0]; + return `calendar-${this.profile}-event-type-`+(Object.keys(eventType))[0]; } } @@ -292,7 +292,7 @@ export class AgendaPage implements OnInit { timeLineTemplate(startTime: string, eventlocation: string, eventDiscription: any, calendarName: string, subject: string): string{ return ` -
+
${startTime}${eventlocation}
diff --git a/src/assets/images/icons-profile-calendar-md.svg b/src/assets/images/icons-profile-calendar-md.svg index c00684e68..50467ae8d 100644 --- a/src/assets/images/icons-profile-calendar-md.svg +++ b/src/assets/images/icons-profile-calendar-md.svg @@ -1,6 +1,6 @@ - + diff --git a/src/assets/images/icons-profile-calendar-pr.svg b/src/assets/images/icons-profile-calendar-pr.svg index c377a04b7..4cd7a439d 100644 --- a/src/assets/images/icons-profile-calendar-pr.svg +++ b/src/assets/images/icons-profile-calendar-pr.svg @@ -1,6 +1,6 @@ - - - + + + diff --git a/src/global.scss b/src/global.scss index 2d929b05c..4bd338052 100644 --- a/src/global.scss +++ b/src/global.scss @@ -46,17 +46,19 @@ td.monthview-current{ justify-content: center; align-items: center; text-align: center; - color: white; + /* color: white; */ } } .monthview-secondary-with-event, .monthview-secondary-with-event[_ngcontent-dwf-c153] { background-color: white !important; + color: black !important; } +// selected date td.monthview-selected { background-color: #42b9fe30 !important; - color: black !important; + color: white !important; } .event-detail-container{ @@ -125,15 +127,27 @@ td.monthview-selected { } -.timeline-box-Pessoal{ +.timeline-pr-box-Pessoal{ + + border-left: 5px solid #99e47b !important; + height: 100%; +} +.timeline-pr-box-Oficial{ + + border-left: 5px solid #958bfc !important; + height: 100%; +} + + +.timeline-mdgpr-box-Oficial{ border-left: 5px solid #ffb703 !important; - height: 100%; } -.timeline-box-Oficial{ +.timeline-mdgpr-box-Pessoal{ border-left: 5px solid #f05d5e !important; - height: 100%; } + + .table-bordered, .table-bordered{ border: none !important; td, th { @@ -147,40 +161,46 @@ td.monthview-selected { .timeline-box-{} -.calendar-event-type-Oficial{ - border-right: 3px solid #f05d5e !important; +.calendar-event-border{ border-radius: 21px !important; color: black !important; margin: 0px auto !important; width: 35px !important; } - -.calendar-event-type-Pessoal{ +.calendar-mdgpr-event-type-Oficial{ + border-right: 3px solid #f05d5e !important; +} +.calendar-mdgpr-event-type-Pessoal{ border-left: 3px solid #ffb703 !important; - border-radius: 21px !important; - color: black !important; - margin: 0px auto !important; - width: 35px !important; +} +.calendar-mdgpr-event-type-both{ + border-left: 3px solid #ffb703 !important; + border-right: 3px solid #f05d5e !important; +} +.calendar-pr-event-type-both{ + border-left: 3px solid #99e47b !important; + border-right: 3px solid #958bfc !important; } -.calendar-event-type-both{ - border-radius: 21px !important; - border-left: 3px solid #ffb703 !important; - border-bottom: none !important; - border-right: 3px solid #f05d5e !important; - color: black !important; - margin: 0px auto !important; - width: 35px !important; +.calendar-pr-event-type-Oficial{ + border-left: 3px solid #99e47b !important; +} +.calendar-pr-event-type-Pessoal{ + border-left: 3px solid #958bfc !important; } .cal-hour-segment { border-bottom: none !important; } - - +// current day td.monthview-current{ border-bottom: 1px solid #3a87ad !important; + color: black !important; +} + +.calendar-profile{ + font-size: 36px } /* angular-cli file: src/styles.css */