diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 5f96b58a0..a859dbcb0 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -16,22 +16,6 @@ - - - {{view.dates[row*7+col].label}}
-
+
@@ -135,7 +119,7 @@
{{view.dates[row*7+col].label}}
-
+
@@ -185,7 +169,7 @@
{{view.dates[row*7+col].label}}
-
+
diff --git a/src/app/pages/events/attachments/attachments.page.html b/src/app/pages/events/attachments/attachments.page.html index 0b6b4d1c9..ab85e8115 100644 --- a/src/app/pages/events/attachments/attachments.page.html +++ b/src/app/pages/events/attachments/attachments.page.html @@ -1,7 +1,7 @@ - Voltar + Anexos do evento @@ -10,27 +10,14 @@
- -
-
-
- -
-
-

{{ att.SourceName }}

-

{{ att.CreateDate }}

-

{{ att.Description }}

-
-
-
-
- -
-
-

{{ att.Stakeholders }}

-
-
-
+ + + +

{{ att.SourceName }}

+

{{ att.Description }}

+

{{ att.CreateDate }}

+

{{ att.Stakeholders }}

+
diff --git a/src/app/pages/events/attachments/attachments.page.scss b/src/app/pages/events/attachments/attachments.page.scss index a2251f00b..1fcec0df0 100644 --- a/src/app/pages/events/attachments/attachments.page.scss +++ b/src/app/pages/events/attachments/attachments.page.scss @@ -1,4 +1,14 @@ /* CONTENT */ +ion-content{ + --background: #f2f2f2; +} +.div-attach-results{ + background: none; +} +ion-list, ion-item-sliding{ + background: none; + +} .item-list-small{ font-size: 14px; overflow: auto; @@ -14,84 +24,25 @@ } //DIV -.div-item{ - width: 100%; - overflow: auto; - border-bottom: 1px solid #ccc; - margin: 10px 0 5px 0; - } - .div-up{ - width: 100%; - overflow: auto; - } - .div-up h3{ - margin: 0; - padding: 0; - font-size: 17px; - width: 100%; - } - .div-icon{ - width: 10%; - font-size: 22px; - float: left; - color: #808080; - } - .div-icon ion-icon{ - display: block; - margin: 0 auto; - - } +.main-item{ + margin: 15px; + /* border: 1px solid #ccc; */ + border-radius: 5px; + box-shadow: 0 4px 8px 0 #ccc, 0 6px 20px 0 #f2f2f2; +} .div-content-attachment{ - width: 85%; - float: left; - padding: 0 0 0 12px; + margin:0; + padding: 10px; } - - .div-content-oficial h3, .div-content-pessoal h3{ - font-size: 16pt; - /* border: 1px solid red; */ + .div-content-attachment h3{ + font-size: 18px; + font-weight: 700; + padding-bottom: 5px; } - .div-content-oficial p, .div-content-pessoal p{ - font-size: 14pt; - color: rgb(94, 92, 92); - padding: 0 !important; - margin: 0 !important; - } - .div-botton{ - width: 100%; - overflow: auto; - margin: 10px 0 5px 0; - } - .div-botton-left{ - width: 10%; - float: left; - } - .ion-icon-location{ - text-align: center; - display: block; - color: #000; - font-size: 16px; - margin: 0 auto; - } - .div-botton-middle{ - width: 75%; - float: left; - margin-top: 0.5px; - } - .div-botton-middle p{ - padding: 0; - margin: 0; - } - .div-botton-right{ - width: 10%; - float: left; - margin: 0; - padding: 0; - } - .ion-icon-attach{ - color: #666666; - font-size: 20px; + ion-item ion-icon{ + --border-color: red; } + /* Custom Skeleton Line Height and Margin */ .custom-skeleton ion-skeleton-text { line-height: 13px; diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index f2ea05768..d895e1b56 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -2,9 +2,6 @@ Intervenientes - - Adicionar intervenientes - @@ -17,42 +14,27 @@ -
+ + + Adicionar intervenientes + + + Delete -
-
-
-

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

-
-
-
+ + +

{{ attendee.Name }}

+

{{ attendee.EmailAddress }}

+
-
-
+
diff --git a/src/app/pages/events/attendees/attendees.page.scss b/src/app/pages/events/attendees/attendees.page.scss index e69de29bb..7250a6c2a 100644 --- a/src/app/pages/events/attendees/attendees.page.scss +++ b/src/app/pages/events/attendees/attendees.page.scss @@ -0,0 +1,11 @@ +ion-item-group{ + margin: 15px; +} +ion-item{ + border-bottom:1px solid #ccc; +} +ion-button{ + width: 90%; + margin: 0 auto; + margin-bottom: 15px; +} \ No newline at end of file diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html index b25255a4a..f5858bb17 100644 --- a/src/app/pages/events/event-detail/event-detail.page.html +++ b/src/app/pages/events/event-detail/event-detail.page.html @@ -22,11 +22,11 @@ Localização - + Calendário @@ -43,18 +43,44 @@ Data Fim - + +
+ + + +
+ +
+
+
+ + Intervenientes + +
+ + + +
+ +
+
+
+ + Anexos + +
+
- Apagar - Gravar + Apagar + Gravar
diff --git a/src/app/pages/events/event-detail/event-detail.page.scss b/src/app/pages/events/event-detail/event-detail.page.scss index 3cf6ba865..8f33ce50e 100644 --- a/src/app/pages/events/event-detail/event-detail.page.scss +++ b/src/app/pages/events/event-detail/event-detail.page.scss @@ -1,50 +1,76 @@ +.div-item{ + width: 100%; + overflow: auto; + border-bottom: 1px solid #ccc; + margin: 10px 0 5px 0; +} +.div-up{ + width: 100%; + overflow: auto; +} +.div-up h3{ + margin: 0; + padding: 0; + font-size: 17px; + width: 100%; +} +.div-icon{ + width: 10%; + font-size: 22px; + float: left; + color: #808080; +} +.div-icon ion-icon{ + display: block; + margin: 0 auto; + +} +.div-content-attachment{ + width: 85%; + float: left; + padding: 0 0 0 12px; +} +.ion-icon-attach{ + color: #666666; + font-size: 20px; +} +ion-item-group{ + margin: 15px; + +} +.btn-attach{ + margin: 15px 0 0 0; + --color: #333; + --border-color:#333; +} +.div-card-button{ + width: 100%; + overflow: auto; + padding: 0 !important; +} +ion-card{ + margin: 2.5% !important; + width: 45%; + float: left; +} +.center{ + text-align: center; + float: center; +} + +/* FFOTER */ .event-detail-buttons{ - width: 80%; - margin: 10px auto; + width: 90%; + margin: 10px auto; } .event-detail-buttons ion-button{ - width: 40%; + width: 45%; + margin-bottom: 15px; } .ion-button-left{ - float: left; - background: none; + float: left; + background: none; } .ion-button-right{ - float: right; -} -.div-item{ - width: 100%; - overflow: auto; - border-bottom: 1px solid #ccc; - margin: 10px 0 5px 0; - } - .div-up{ - width: 100%; - overflow: auto; - } - .div-up h3{ - margin: 0; - padding: 0; - font-size: 17px; - width: 100%; - } - .div-icon{ - width: 10%; - font-size: 22px; - float: left; - color: #808080; - } - .div-icon ion-icon{ - display: block; - margin: 0 auto; - - } - .div-content-attachment{ - width: 85%; - float: left; - padding: 0 0 0 12px; - } - .ion-icon-attach{ - color: #666666; - font-size: 20px; - } \ No newline at end of file + float: right; +} \ No newline at end of file