diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 5fde5507e..a863a43e3 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -10,7 +10,7 @@
- +
@@ -24,8 +24,8 @@
{{loadedEvent.Location}}
-
- {{loadedEvent.CalendarName}} +
+ {{loadedEvent.CalendarName}}
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 81e3ce56b..e1adb2189 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -38,7 +38,7 @@ ion-menu{ overflow: hidden; } .middle{ - width: 220px; + width: 230px; padding: 0!important; float: left; margin: 2.5px 0 0 0; @@ -57,8 +57,7 @@ ion-menu{ } .div-icon .edit{ font-size: 35px; - float: right; - padding-left: 20px; + float: left; } .div-icon .delete{ padding: 7px; @@ -66,6 +65,7 @@ ion-menu{ color:#fff; background: #d30606; border-radius: 20px; + margin-left: 10px; } } @@ -102,13 +102,37 @@ ion-menu{ float: left; margin: 5px 5px 5px 0px; } - .button-calendar-type{ + .button-mdgpr-Oficial{ width: 91px; - --border-radius: 12.5px; + --border-radius: 20px; --background: #ffb703; margin-left: 5px; float: left; } + .button-mdgpr-Pessoal{ + width: 91px; + --border-radius: 20px; + --background: #f05d5e; + margin-left: 5px; + float: left; + } + + .button-pr-Oficial{ + width: 91px; + --border-radius: 20px; + --background: #cbeecb; + margin-left: 5px; + float: left; + } + .button-pr-Pessoal{ + width: 91px; + --border-radius: 20px; + --background: #cab0dc; + margin-left: 5px; + float: left; + } + + .button-calendar-type ion-button{ height: 25px; } diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index c1bc14f70..4dfe86bbf 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -41,6 +41,7 @@ export class ViewEventPage implements OnInit { public alertController: AlertController, ) { + this.profile = this.navParams.get('profile'); this.isEventEdited = false; this.loadedEvent = new Event(); this.eventBody = { BodyType : "1", Text : ""}; diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index f8b909958..fd0565e60 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -37,7 +37,7 @@