diff --git a/src/app/domain/process/DispatchDomain.ts b/src/app/domain/process/DispatchDomain.ts index 676e1c432..946a69524 100644 --- a/src/app/domain/process/DispatchDomain.ts +++ b/src/app/domain/process/DispatchDomain.ts @@ -23,7 +23,7 @@ export class DispatchDomain { * @activityInstanceName 'Concluir Despacho' * @param note * @param documents - * @param serialNumber + * @param serialNumber * @returns */ @prohibited({userRoleId:[], permission:[]}) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index c668783ba..34b79c980 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -5,41 +5,39 @@ - - - + - - - Início + + + Início - - - Agenda + + + Agenda - - - Gabinete + + + Gabinete - - - Acções + + + Acções - - - Chat + + + Chat diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss index 2126a0282..e2b076c6e 100644 --- a/src/app/home/home.page.scss +++ b/src/app/home/home.page.scss @@ -52,3 +52,20 @@ ion-tab-button.active{ color: #061b52; font-weight: 650; } + + + +@media only screen and (min-width: 100px) { + + ion-tab-button{ + font-size: 14px; + } +} + +@media only screen and (min-width: 500px) { + + ion-tab-button{ + font-size: 16px; + } +} + diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss index 35049c06c..f4d30d350 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.scss +++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .main-content{ overflow: hidden !important; } @@ -31,7 +33,7 @@ width: 74.67%; margin: 0 auto; overflow: auto; - font-size: 8.5px; + font-size: rem(8.5); font-family: Bahnschrift; .logo-description-content{ @@ -84,7 +86,7 @@ float: left; .profile-title{ - font-size: 20px; + font-size: rem(20); font-weight: 300; margin-bottom: 20px; } @@ -92,7 +94,7 @@ margin-top: 20px; color: black; font-family: Roboto; - font-size: 13px; + font-size: rem(13); .user-role{ background-color: white; @@ -117,7 +119,7 @@ height: 40px; float: left; padding: 5px; - font-size: 25px; + font-size: rem(25); } .ion-input-class{ width: calc(100% - 40px); @@ -135,7 +137,7 @@ } .icon{ - font-size: 40px; + font-size: rem(40); } .profile-pic{ @@ -154,12 +156,12 @@ margin-top: 15px; float: left; font-family: Roboto; - font-size: 13px; + font-size: rem(13); font-weight: 300; .preference{ - font-size: 20px; + font-size: rem(20); margin-bottom: 0 !important; } .checkBox{ diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss index c1d0f8708..00469f587 100644 --- a/src/app/modals/profile/profile.page.scss +++ b/src/app/modals/profile/profile.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .profile-header { margin: 0 em(20px); // background-color: #0782c9; @@ -6,7 +8,7 @@ .div-logo{ background: transparent; - width: em(140px); + width: em(140); justify-content: center; display: flex; color: black; @@ -27,7 +29,7 @@ width: 74.67%; margin: 0 auto; overflow: auto; - font-size: 8.5px; + font-size: rem(8.5); font-family: Bahnschrift; .logo-description-content{ @@ -79,19 +81,19 @@ } .icon { - font-size: 40px; + font-size: rem(40); } .profile-name { font-weight: 300; - font-size: 20px !important; + font-size: rem(20) !important; margin-bottom: 17px !important; color: var(--profile-text-color) !important; } .profile-title { font-weight: 300; - font-size: 20px !important; + font-size: rem(20) !important; margin-bottom: 40px !important; color: var(--profile-text-color) !important; } @@ -143,7 +145,7 @@ ion-list { overflow: auto; } .notification-icon { - font-size: 35px !important; + font-size: rem(35) !important; } .approve-event-time { width: fit-content !important; diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 21c00621a..0fc0d2c24 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -1,4 +1,3 @@ -import * as internal from "stream"; export class DailyWorkTask { SerialNumber: string; diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 37692946a..9b1dc6a9c 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -18,7 +18,7 @@
-
+
@@ -178,25 +178,25 @@
- - -
+
Todas
-
+
Pessoais
-
+
Oficiais
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index a7db55288..91e64cf04 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -1,3 +1,4 @@ +@import '~src/function.scss'; .event-indicator { background: #333; @@ -55,12 +56,12 @@ float: left; } .title { - font-size: 25px; + font-size: rem(25); } .div-icon{ width: 40px; float: right; - font-size: 35px; + font-size: rem(35); overflow: auto; padding: 1px; } @@ -145,7 +146,7 @@ input:checked + .slider:before { transform: translate(-50%,-50%); top: 50%; left: 50%; - font-size: 12px; + font-size: rem(12); font-family: Verdana, sans-serif; } @@ -224,7 +225,7 @@ label{ position: absolute; color: #fff; font-weight: 600; - font-size: 12px; + font-size: rem(12); pointer-events: none; } .onbtn{ @@ -245,7 +246,7 @@ td.monthview-primary-with-event { } .header-title{ font-family: Roboto; - font-size: 25px; + font-size: rem(25); margin: 0 5px 0 25px; padding: 0; /* color:#ffffff; */ @@ -260,7 +261,7 @@ td.monthview-primary-with-event { border: 0!important; .div-search{ - font-size: 45px; + font-size: rem(45); float: left; margin: 0 0 0 10px } @@ -274,7 +275,7 @@ td.monthview-primary-with-event { width: 100%; } .div-profile{ - font-size: 45px; + font-size: rem(45); float: right; margin-right: 10px; } @@ -295,7 +296,7 @@ td.monthview-primary-with-event { } div ion-raw > ul > li{ - font-size: 11pt; + font-size: rem(15); font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; } @@ -311,10 +312,10 @@ td.monthview-primary-with-event { .calendar-tool-tip{ ion-icon{ - font-size: 30px; + font-size: rem(30); } .arrow-down{ - font-size: 28px; + font-size: rem(28); } } @@ -370,7 +371,7 @@ td.monthview-primary-with-event { .capitaliseText{ - font-size: 20px; + font-size: rem(20); } @@ -389,7 +390,7 @@ td.monthview-primary-with-event { justify-content: space-around; th { font-family: Roboto; - font-size: 15px; + font-size: rem(15); color: rgba(52, 72, 94, 0.54); font-weight: normal; } @@ -402,20 +403,20 @@ td.monthview-primary-with-event { cursor: pointer; padding: 10px 20px; .collaps{ - font-size: 20px; + font-size: rem(20); padding-right: 8px; } .filter{ - font-size: 15px; + font-size: rem(15); font-weight: normal; ion-icon{ - font-size: 35px; + font-size: rem(35); color: var(--title-text-color); } .filter-name{ color: var(--title-text-color); font-family: Roboto; - font-size: 15px; + font-size: rem(15); margin-right: 25px; width: 55px; } @@ -434,7 +435,7 @@ td.monthview-primary-with-event { z-index: 1000000; li{ padding: 5px 10px; - font-size: 15px; + font-size: rem(15); font-weight: normal; } li.active{ @@ -450,7 +451,7 @@ td.monthview-primary-with-event { } .timeline-date{ - font-size: 13px; + font-size: rem(13); font-weight: 500; color: gray; } @@ -471,7 +472,7 @@ td.monthview-primary-with-event { .day { font-weight: 500; color: gray !important; - font-size: 13px; + font-size: rem(13); } .EventListBoxBorder{ padding-bottom: 5px; @@ -491,19 +492,19 @@ td.monthview-primary-with-event { .time-start{ color: #797979 !important; font-family: Roboto; - font-size: 13px; + font-size: rem(13); } .time-end{ color: #797979 !important; font-family: Roboto; - font-size: 13px; + font-size: rem(13); } } .schedule-date{ margin-right: 10px; width: 22%; color: #797979 !important; - font-size: 13px; + font-size: rem(13); } .schedule-details{ display: flex; @@ -516,12 +517,12 @@ td.monthview-primary-with-event { width: 100%; font-family: Roboto; color: black; - font-size: 14px; + font-size: rem(14); } .calendar-owner { - font-size: 14px; + font-size: rem(14); } .description{ @@ -535,7 +536,7 @@ td.monthview-primary-with-event { white-space: nowrap; overflow: hidden !important; text-overflow: ellipsis !important; - font-size: 17px; + font-size: rem(17); } } @@ -560,7 +561,7 @@ td.monthview-primary-with-event { padding: 0 0 0 12px; } .div-content-Oficial h3, .div-content-Pessoal h3{ - font-size: 14pt; + font-size: rem(19); /* border: 1px solid red; */ } .div-content-Oficial p, .div-content-Pessoal p{ @@ -839,7 +840,7 @@ app-approve-event{ .resize{ font-size: 27px !important; ion-icon{ - font-size: 27px !important; + font-size: rem(27) !important; } } } @@ -861,7 +862,7 @@ app-approve-event{ $font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; -$font-size: 11pt; +$font-size: rem(15); .changeText{ font-family: $font-family; @@ -888,9 +889,6 @@ $font-size: 11pt; border: 1.5px solid black; color: white; display: none; - .text{ - - } } @@ -1004,4 +1002,36 @@ $font-size: 11pt; ion-icon { color: unset !important; } -} \ No newline at end of file +} + + + + +@media only screen and (min-width: 100px) { + + .calendar-title-container { + font-size: 14px; + } + .height-75 { + height: 75px; + } + + .height-356 { + height: 324px; + } +} + +@media only screen and (min-width: 500px) { + + .calendar-title-container { + font-size: 16px; + } + .height-75 { + height: 75px; + } + + .height-356 { + height: 356px; + } +} + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index fdcc88b7b..ec85ae02a 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -67,7 +67,7 @@ export class AgendaPage implements OnInit { // calendar showCalendar: boolean; - calendarHeight: string; + calendarHeight = []; // for timeline events: CalendarEvent[] = []; @@ -222,7 +222,7 @@ export class AgendaPage implements OnInit { } - this.calendarHeight = "356px"; + this.calendarHeight = ["height-356"]; this.showCalendar = true; this.timelineDate = momentG(new Date(), 'dd MMMM yyyy'); diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 952f4793a..021c8307a 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -8,7 +8,7 @@
- Editar Evento + Editar Evento
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index b1f6167be..8b7c48bc9 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -3,7 +3,7 @@
- Novo Evento
+ Novo Evento
Campos marcados com * são obrigatórios
diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss index c0202be99..2ed84b876 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + ion-content{ --background:transparent; } 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 b5c64d9a0..1cd6ad4f0 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -17,7 +17,7 @@
-

{{loadedEvent.Subject}}

+

{{loadedEvent.Subject}}

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 86da78e37..c7450cd90 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + ion-content{ /* --padding-top:15px; */ /* --padding-end:15px; @@ -34,7 +36,7 @@ ion-content{ .title{ width: fit-content; - font-size: 25px !important; + font-size: rem(25) !important; float: left; } .btn-no-color{ @@ -44,7 +46,7 @@ ion-content{ .title-icon{ float: right; margin-right: 20px; - font-size: 30px; + font-size: rem(30); color: #42b9fe; } .title-icons{ @@ -90,7 +92,7 @@ ion-content{ border: 0!important; .div-search{ - font-size: 45px; + font-size: rem(45); float: left; margin: 0 0 0 10px } @@ -104,7 +106,7 @@ ion-content{ width: 100%; } .div-profile{ - font-size: 45px; + font-size: rem(45); float: right; margin-right: 10px; } @@ -173,7 +175,7 @@ ion-content{ .exp-card-icon{ width: fit-content; - font-size: 48px; + font-size: rem(48); float: left !important; } .exp-card-text{ @@ -188,17 +190,17 @@ ion-content{ margin: 0 auto; } .exp-card ion-icon{ - font-size: 48px !important; + font-size: rem(48) !important; } .exp-card fa-icon{ - font-size: 30px; + font-size: rem(30); padding: 0 1px 0 1px; margin: 6px; //border: 1px solid #ccc; color: #797979; } .exp-card-title{ - font-size: 15px; + font-size: rem(15); color: var(--title-text-color);; font-family: Roboto; font-weight: bold; @@ -212,7 +214,7 @@ ion-content{ } .exp-card-content{ - font-size: 13px; + font-size: rem(13); color: #797979; margin: 11px 0 0; font-family: Roboto; @@ -238,11 +240,11 @@ ion-content{ float: left; } .title{ - font-size: 25px; + font-size: rem(25); } .div-icon{ float: right; - font-size: 35px; + font-size: rem(35); overflow: auto; } @@ -256,7 +258,7 @@ ion-content{ border:1px solid #e9e9e9 !important; background-color: #fff !important; margin-bottom: 10px !important; - padding: 15px; + padding: rem(15); .item{ background-color: var(--white); @@ -267,7 +269,7 @@ ion-content{ width: 100%; float: left; font-family: Roboto; - font-size: 12pt; + font-size: rem(16); font-weight: 700; color: var(--title-text-color); padding-left: 3px; @@ -300,7 +302,7 @@ ion-content{ } } .item-middle-detail{ - font-size: 10pt; + font-size: rem(13); width: 100%; overflow: auto; padding-left: 3px; @@ -323,7 +325,7 @@ ion-content{ } } .item-middle-detail-extra{ - font-size: 10pt; + font-size: rem(13); padding-left: 3px; //border: 1px solid red; @@ -337,7 +339,7 @@ ion-content{ } } .item-bottom-detail{ - font-size: 12pt; + font-size: rem(16); width: 100%; overflow: auto; margin-top: 10px; @@ -361,7 +363,7 @@ ion-content{ .item-date{ width: auto; font-family: Roboto; - font-size: 10pt; + font-size: rem(13); font-weight: normal; font-stretch: normal; font-style: normal; @@ -626,7 +628,7 @@ ion-content{ //margin-top: 28px; width: 45px; float: left; - font-size: 40px; + font-size: rem(40); .item-icon ion-icon{ color: #061b52; @@ -636,7 +638,7 @@ ion-content{ //margin-top: 23px; width: 45px; float: left; - font-size: 40px; + font-size: rem(40); } .item-content{ @@ -653,26 +655,26 @@ ion-content{ .item-content-date{ color: #797979; - font-size: 13px; + font-size: rem(13); margin: 0 !important; padding: 0 !important; } .item-content-title{ color: var(--title-text-color); - font-size: 15px; + font-size: rem(15); margin: 0 !important; padding: 0 !important; } .item-content-detail{ color: #000000; - font-size: 13px; + font-size:rem(13); margin: 0 !important; padding: 0 !important; } .item-options{ color: var(--box-hover-background-color); width: 25px; - font-size: 20px; + font-size: rem(20); } .item-content-date-active, .item-content-title-active, .item-content-detail-active{ color: #fff; @@ -692,7 +694,7 @@ ion-content{ .new-task-count{ color: red; - font-size: 13px; + font-size: rem(13); } @@ -700,14 +702,14 @@ ion-content{ background-color: white; border-radius: 27.5px; border: solid 1px #ebebeb; - font-size: 14px; + font-size: rem(14); .icon{ color: #797979; width: 41px; height: 41px; display: flex; justify-content: center; - font-size: 25px; + font-size: rem(25); align-items: center; } .input-text{ diff --git a/src/app/pages/publications/publication-detail/publication-detail-routing.module.ts b/src/app/pages/publications/publication-detail/publication-detail-routing.module.ts deleted file mode 100644 index d1ed32f55..000000000 --- a/src/app/pages/publications/publication-detail/publication-detail-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { PublicationDetailPage } from './publication-detail.page'; - -const routes: Routes = [ - { - path: '', - component: PublicationDetailPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class PublicationDetailPageRoutingModule {} diff --git a/src/app/pages/publications/publication-detail/publication-detail.module.ts b/src/app/pages/publications/publication-detail/publication-detail.module.ts deleted file mode 100644 index 116453af2..000000000 --- a/src/app/pages/publications/publication-detail/publication-detail.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { PublicationDetailPageRoutingModule } from './publication-detail-routing.module'; - -import { PublicationDetailPage } from './publication-detail.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - PublicationDetailPageRoutingModule - ], - declarations: [PublicationDetailPage] -}) -export class PublicationDetailPageModule {} diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html deleted file mode 100644 index 4739432c6..000000000 --- a/src/app/pages/publications/publication-detail/publication-detail.page.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - -
-
-
-
- - - -
-
- {{publication.Title}} -

{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}

-
-
- -
-
- image -
-
- image -
-
- 
{{publication.Message}}
-
-
-
-
-
-
- - - -
-
- -

-
-
-
-
- image -
-
-

-

-
-
- -
-
- - - - - - - - - - - - diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/publication-detail/publication-detail.page.scss deleted file mode 100644 index 3230c6d73..000000000 --- a/src/app/pages/publications/publication-detail/publication-detail.page.scss +++ /dev/null @@ -1,89 +0,0 @@ - - ion-content{ - --background: transparent; - --border-radius: 30px; - } - ion-footer{ - background: #fff; - } - ion-toolbar{ - border-width: 0 !important; - } - .div-top-header{ - margin: 0 auto; - background-color: #0782c9; - overflow: auto; - padding-top: 15px; - border: 0!important; - } - .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; - } - .content-top{ - background: #f3f2f2; - height: 20px; - margin: 0 auto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; -} - .content-container{ - width: 100%; - margin:0 auto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; - background: #ffffff; - height: 100%; - padding: 25px 0px 0 0px; - overflow: auto; - } - .title-content{ - margin: 0px auto; - overflow: auto; - padding: 0 !important; - } - .back-icon{ - width: auto; - float: left; - font-size: 35px; - overflow: auto; - } - .div-title{ - /* padding: 0!important; */ - float: left; - margin: 2.5px 0 0 5px; - } - .title{ - font-size: 25px; - } - .post-img{ - width: 100%; - height: 400px; - margin: 0 auto; - border-radius: 0px!important; - overflow: hidden; -} -.post-img img{ - width: 100%; - height: 100%; - object-fit: cover; -} -.post-description{ - margin: 0 auto; - margin-bottom: 35px; -} \ No newline at end of file diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.spec.ts b/src/app/pages/publications/publication-detail/publication-detail.page.spec.ts deleted file mode 100644 index 8a3f20488..000000000 --- a/src/app/pages/publications/publication-detail/publication-detail.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { PublicationDetailPage } from './publication-detail.page'; - -describe('PublicationDetailPage', () => { - let component: PublicationDetailPage; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ PublicationDetailPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(PublicationDetailPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts deleted file mode 100644 index 12f070c4f..000000000 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ /dev/null @@ -1,146 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { AnimationController, ModalController, NavParams } from '@ionic/angular'; -import { Publication } from 'src/app/models/publication'; -import { PublicationsService } from 'src/app/services/publications.service'; -import { ToastService } from 'src/app/services/toast.service'; -import { ImageModalPage } from '../gallery/image-modal/image-modal.page'; -import { NewPublicationPage } from '../new-publication/new-publication.page'; -import { SqliteService } from 'src/app/services/sqlite.service'; -import { BackgroundService } from 'src/app/services/background.service'; -import { ThemeService } from 'src/app/services/theme.service' -import { RouteService } from 'src/app/services/route.service'; -import { PermissionService } from 'src/app/services/permission.service'; -import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; - -@Component({ - selector: 'app-publication-detail', - templateUrl: './publication-detail.page.html', - styleUrls: ['./publication-detail.page.scss'], -}) -export class PublicationDetailPage implements OnInit { - showLoader: boolean; - publicationId: string; - folderId: string; - publication: Publication; - - constructor( - private modalController: ModalController, - private navParams:NavParams, - private publications:PublicationsService, - private toastService: ToastService, - private RouteService: RouteService, - public ThemeService: ThemeService, - public p:PermissionService, - private httpErrorHandle: HttpErrorHandle ) { - - this.publicationId = this.navParams.get('publicationId'); - /* this.folderId = this.navParams.get('folderIdId'); */ - this.publication = { - DateIndex: null, - DocumentId: null, - ProcessId:'', - Title:'', - Message: '', - /* image: null, */ - DatePublication: null, - FileBase64: '', - OriginalFileName: '', - FileExtension: '', - }; - } - - ngOnInit() { - this.getPublicationDetail(); - } - doRefresh(event) { - this.getPublicationDetail(); - - setTimeout(() => { - try { - event?.target?.complete(); -} catch(error) {} - }, 2000); - } - - getPublicationDetail() { - this.showLoader = true; - this.publications.GetPublicationById(this.publicationId).subscribe(res=>{ - - /* this.publication = res; */ - this.publication = { - DateIndex: res.DateIndex, - DocumentId: res.DocumentId, - ProcessId:res.ProcessId, - Title:res.Title, - Message: res.Message, - DatePublication: res.DatePublication, - FileBase64: "data:image/jpg;base64," + res.FileBase64, - OriginalFileName: res.OriginalFileName, - FileExtension: 'jpeg', - } - this.showLoader = false; - }); - } - - getFromDB() { - - } - - close() { - this.RouteService.goBack() - - } - - async deletePost() { - - const loader = this.toastService.loading() - - try { - await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise(); - this.httpErrorHandle.httpsSucessMessagge('Eliminar publicação') - if(window['app-view-publications-page-doRefresh']) { - window['app-view-publications-page-doRefresh']() - } - this.close(); - } catch (error) { - this.httpErrorHandle.httpStatusHandle(error) - } finally { - loader.remove() - } - - } - - async editPost(publicationType:any) { - - - const modal = await this.modalController.create({ - component: NewPublicationPage, - componentProps:{ - publicationType: publicationType, - publication: this.publication, - }, - cssClass: 'new-publication modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then(()=>{ - setTimeout(() => { - this.getPublicationDetail(); - }, 5000); - }); - } - - openPreview(imageUrl:string){ - this.modalController.create({ - component: ImageModalPage, - componentProps: { - imageUrl:imageUrl, - } - }).then(modal => modal.present()); - } - - - - - -} diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 1c49e6754..8b0fd0b6a 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -18,7 +18,7 @@
- Acções + Acções
@@ -45,17 +45,15 @@ [class.item-active]="evento.ProcessId == idSelected" (click)="goToPublicationsList(evento.ProcessId)">
- - - - - + + + + +
- -

{{getDate(evento.DateBegin)}}

-

{{evento.Description}}

- +

{{getDate(evento.DateBegin)}}

+

{{evento.Description}}

diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index 931e4024f..9defbfbb8 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -1,3 +1,15 @@ +@media only screen and (min-width: 100px) { + :host{ + font-size: 14px; + } +} + +@media only screen and (min-width: 500px) { + :host{ + font-size: 16px; + } +} + :host{ // background: #0782c9; } @@ -61,9 +73,6 @@ ion-toolbar{ .div-title{ padding: 0!important; } - .title{ - font-size: 25px; - } .div-icon{ display: flex; /* width: 45px; @@ -125,9 +134,7 @@ ion-toolbar{ } .item-icon2{ //margin-top: 23px; - width: 45px; float: left; - font-size: 40px; } .item-content{ @@ -144,13 +151,11 @@ ion-toolbar{ .item-content-date{ color: #797979; - font-size: 13px; margin: 0 !important; padding: 0 !important; } .item-content-title{ color: var(--title-text-color); - font-size: 15px; margin: 0 !important; padding: 0 !important; } @@ -247,3 +252,20 @@ ion-toolbar{ } } + + + +@media only screen and (min-width: 100px) { + + .item-icon2, .title-content, .main-content, .item { + font-size: 14px; + } +} + +@media only screen and (min-width: 500px) { + + .item-icon2, .title-content, .main-content, .item { + font-size: 16px; + } +} + diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html index efd173932..909bf2c98 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html @@ -8,17 +8,17 @@ -
+
- - - + + +
- {{publication.Title}} -

{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}

+

{{publication.Title}}

+

{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}

@@ -30,7 +30,7 @@ image
- 
{{publication.Message}}
+ 
{{publication.Message}}
@@ -38,9 +38,9 @@
- - - + + +
@@ -61,16 +61,16 @@
- + diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss index 1802e0968..50295dfcf 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss @@ -12,32 +12,7 @@ /* --background:#0782c9; */ border-width: 0 !important; } - .div-top-header{ - margin: 0 auto; - background-color: #0782c9; - overflow: auto; - padding-top: 15px; - border: 0!important; - } - .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; - } + .content-top{ background: #f3f2f2; height: 20px; @@ -62,17 +37,13 @@ .back-icon{ width: auto; float: left; - font-size: 35px; overflow: auto; } .div-title{ /* padding: 0!important; */ float: left; - margin: 2.5px 0 0 5px; - } - .title{ - font-size: 25px; } + .post-img{ width: 100%; height: 400px; diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 623bb0ea2..a9d46bfe1 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -1,18 +1,18 @@ -
+
-
- - - +
+ + +
- {{publicationItem[folderId].Description}} -

{{publicationItem[folderId].Detail}}

-

{{publicationItem[folderId].DateBegin | date: 'dd-MM-yy HH:mm'}}

+

{{publicationItem[folderId].Description}}

+

{{publicationItem[folderId].Detail}}

+

{{publicationItem[folderId].DateBegin | date: 'dd-MM-yy HH:mm'}}

-
+
@@ -28,7 +28,7 @@ -
+
-
+
{{publication.Title}}
-
{{publication.DatePublication | date: 'dd-MM-yy HH:mm'}}
+
{{publication.DatePublication | date: 'dd-MM-yy HH:mm'}}
-
- 
{{publication.Message}}
+
+ 
{{publication.Message}}
diff --git a/src/app/pages/publications/view-publications/view-publications.page.scss b/src/app/pages/publications/view-publications/view-publications.page.scss index 2eed91594..24cf05102 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.scss +++ b/src/app/pages/publications/view-publications/view-publications.page.scss @@ -1,7 +1,7 @@ :host{ - background: transparent; - padding: 0!important; - } + background: transparent; + padding: 0!important; +} ion-content{ --background: transparent; --border-radius: 30px; @@ -97,7 +97,6 @@ color: #000 !important; } .title{ - font-size: 25px; color: #000 !important; } @@ -106,16 +105,13 @@ } .actions-icon ion-icon{ margin-left: 10px; - font-size: 35px; float: right; } .item-content-date{ color: #797979; - font-size: 13px; } .item-content-detail{ color: #000000; - font-size: 13px; } .post-item{ width: 100%; @@ -148,18 +144,19 @@ .post-title{ width: 60%; float: left; - font-size: 15px; color: #0d89d1; } .post-data{ width: 40%; float: left; - font-size: 13px; color: #797979; text-align: right; } .post-description{ - font-size: 13px; - color: #000; - + color: #000; } + + +.font-13-em { + font-size: 0.8125em !important; +} diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts index a56642202..c881a4bb7 100644 --- a/src/app/services/theme.service.ts +++ b/src/app/services/theme.service.ts @@ -17,9 +17,7 @@ export class ThemeService { currentTheme: 'gov' | 'default' | 'doneIt' = this.defaultTheme keyName: string - constructor( - private storageservice: StorageService - ) { + constructor() { this.keyName = (SHA1("ThemeService")).toString() let restore = localstoreService.get(this.keyName, { diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts index 87035fc2b..acd713a2e 100644 --- a/src/app/services/toast.service.ts +++ b/src/app/services/toast.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { AnimationController, ModalController, ToastController } from '@ionic/angular'; import { BadRequestPage } from '../shared/popover/bad-request/bad-request.page'; import { SuccessMessagePage } from '../shared/popover/success-message/success-message.page'; +import { ThemeService } from 'src/app/services/theme.service'; @Injectable({ providedIn: 'root' @@ -10,6 +11,7 @@ export class ToastService { constructor( public toastController: ToastController, + public ThemeService: ThemeService, ) { } ngOnInit() {} @@ -188,6 +190,15 @@ export class ToastService { } + async ViewEventOption() { + // this.ThemeService.currentTheme == 'default' + // this.ThemeService.currentTheme == 'gov' + // this.ThemeService.currentTheme == 'doneIt' + + if(this.ThemeService.currentTheme == 'default') { + + } else if (this.ThemeService.currentTheme == 'gov') {} + } async notificationMessage(message?: any, callback?: any,data?: any) { @@ -266,4 +277,4 @@ export class ToastService { } -export const ToastsService = new ToastService(new ToastController()) +export const ToastsService = new ToastService(new ToastController(), new ThemeService()) diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index 9aecb93c1..dafddc1e8 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -14,14 +14,26 @@
-
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index d588e30b3..568961037 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -3,11 +3,11 @@
-
+
- - - + + +
@@ -34,11 +34,12 @@
-
+
+ - - - + + +
-
- +
diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss index 95d77069f..1954ddecb 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -9,7 +9,7 @@ .div-logo{ background: transparent; - width: em(140px); + width: em(140); justify-content: center; display: flex; color: black; @@ -79,7 +79,6 @@ .div-profile { height: fit-content; - font-size: 45px; justify-content: flex-end; display: flex; background-color: transparent; diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss index b3105a989..fccab70da 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss @@ -1,3 +1,6 @@ +@import '~src/function.scss'; + + .container{ --padding-top:20px !important; --padding-bottom:20px !important; @@ -10,7 +13,7 @@ .arrow-right-icon{ width: 37px; float: right; - font-size: 35px; + font-size: rem(35); overflow: hidden; } } diff --git a/src/environments/suport/oapr.ts b/src/environments/suport/oapr.ts index 6c205b2fe..dbbabddbe 100644 --- a/src/environments/suport/oapr.ts +++ b/src/environments/suport/oapr.ts @@ -35,8 +35,8 @@ export const oaprDev: Environment = { despachoLabel2: 'Despachos Presidênciais', production: false, domain: 'oapr.gov.ao', - defaultuser: 'gmanuel@oapr.gov.ao', - defaultuserpwd: 'M@p#2023', + defaultuser: '', + defaultuserpwd: '', chatOffline: true, presidential: true, version: versionData, diff --git a/src/function.scss b/src/function.scss index 818b0bb66..412a6618e 100644 --- a/src/function.scss +++ b/src/function.scss @@ -1,3 +1,4 @@ +@use 'sass:math'; // =============== Custom function ============================== @@ -34,14 +35,14 @@ // convert px to rem @function rem($size) { - $remSize: to-number($size) / 16; + $remSize: math.div(to-number($size), 16); //Default font size on html is 16px; @return #{$remSize}rem; } // convert px to em @function em($size) { - $remSize: to-number($size) / 16px; + $remSize: math.div(to-number($size), 16); @return #{$remSize}em; } diff --git a/src/global.scss b/src/global.scss index c8f5f661d..53f53e95f 100644 --- a/src/global.scss +++ b/src/global.scss @@ -24,8 +24,7 @@ @import "~@ionic/angular/css/text-alignment.css"; @import "~@ionic/angular/css/text-transformation.css"; @import "~@ionic/angular/css/flex-utils.css"; - - +@import '~src/function.scss'; // calendar @@ -108,7 +107,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- .cal-time{ font-family: Roboto; - font-size: 13px; + font-size: rem(13); color: #797979; } @@ -124,12 +123,12 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- color: black; .timeline-start-time, .timeline-location{ font-family: Roboto; - font-size: 13px; + font-size: rem(13); margin-right: 10px; } .timeline-event-discription{ font-family: Roboto; - font-size: 15px; + font-size: rem(15); font-weight: bold; } } @@ -213,7 +212,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- .calendar-profile{ - font-size: 36px + font-size: rem(36) } @@ -600,27 +599,53 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- .calendar-component .monthview-container table.table { td { - width: 50px; - height: 40px; - div { - padding-left: 0px; - } - display: flex; - align-content: center; - justify-content: center; + div { + padding-left: 0px; + } + display: flex; + align-content: center; + justify-content: center; + } - } - td div:not(.day, .day-container, .number) { - width: 30px !important; - height: 30px; - } tr { - display: flex; - justify-content: space-around; + display: flex; + justify-content: space-around; + } + tbody { + tr { + td { + padding: em(8) !important; + div { + width: 30px !important; + height: 30px; + } + div.number { + font-size: em(18) !important; + } + } + } } } +@media only screen and (min-width: 100px) { + + .calendar-component .monthview-container table.table{ + font-size: 12px; + } + +} + +@media only screen and (min-width: 500px) { + + .calendar-component .monthview-container table.table { + font-size: 16px; + } +} + + + + // agenda attendee component .attendee-search-bar input{ border: 1px solid #cecece !important; @@ -642,7 +667,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- -o-border-radius: 3px !important; } .title-icon { - font-size: 40px !important; + font-size: rem(40) !important; color: #42b9fe; overflow: auto; } @@ -653,14 +678,18 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- background: transparent; margin: 0 !important; padding: 0 !important; - ion-icon { - font-size: 35px; - } } .btn-no-color:focus { outline: 0; } + + .btn-no-color { + ion-icon { + font-size: rem(35); + } + } + // center app-diploma-assinar ion-content .main-content, @@ -976,7 +1005,7 @@ background: rgb(92, 92, 92); align-items: center; } .message { - font-size: 12pt; + font-size: rem(16); } } @@ -1015,7 +1044,7 @@ background: rgb(92, 92, 92); align-items: center; } .message { - font-size: 12pt; + font-size: rem(16); } } @@ -1108,7 +1137,7 @@ background: rgb(92, 92, 92); .input-errror-message{ margin-top: -16px; margin-bottom: 10px; - font-size: 11pt; + font-size: rem(15); } @@ -1216,7 +1245,7 @@ ngx-mat-datetime-content{ } .menuButton{ - font-size: 14px; + font-size: rem(14); width: 100%; background: none; padding: 10px 5px 10px 5px; @@ -1289,10 +1318,10 @@ ngx-mat-datetime-content{ color: #d24726; } .icon-size-45{ - font-size: 45px !important; + font-size: rem(45) !important; } .icon-size-27{ - font-size: 27px !important; + font-size: rem(27) !important; color: #797979; } .menu-icon{ @@ -1439,7 +1468,7 @@ ngx-mat-datetime-content{ $font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; -$font-size: 11pt; +$font-size: rem(15); ion-row ul > li{ font-family: $font-family; @@ -1471,14 +1500,14 @@ ion-textarea.heigh-200 textarea { } .dead-line { - font-size: 12px; + font-size: rem(12); color: red; } .new-task { border-radius: 20px; background: #efefef; - font-size: 12px; + font-size: rem(12); float: right; padding: 2.5px 13.5px 2.5px 13.5px; color: #46465b; @@ -1490,7 +1519,7 @@ ion-textarea.heigh-200 textarea { padding-left: 10px; padding-right: 5px; border-radius: 1px; - font-size: 14px; + font-size: rem(14); width: 110px; @@ -1520,14 +1549,14 @@ ion-textarea.heigh-200 textarea { background-color: white; border-radius: 27.5px; border: solid 1px #ebebeb; - font-size: 14px; + font-size: rem(14); .icon{ color: #797979; width: 41px; height: 41px; display: flex; justify-content: center; - font-size: 25px; + font-size: rem(25); align-items: center; } .input-text{ @@ -1539,4 +1568,31 @@ ion-textarea.heigh-200 textarea { } -.row-reverse { display: flex; flex-direction: row-reverse; } \ No newline at end of file +.row-reverse { display: flex; flex-direction: row-reverse; } + + +.transparent--background { + background-color: transparent; +} + + + +@media only screen and (min-width: 100px) { + + + html, body, .viewport-font-size { + font-size: 14px; + } + +} + +@media only screen and (min-width: 500px) { + + html, body, .viewport-font-size { + font-size: 16px; + } +} + +.swiper-slide { + font-size: unset !important; +} \ No newline at end of file diff --git a/src/style/main.scss b/src/style/main.scss index bb7430d66..7e4645888 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + // overflow .v-application .overflow-auto { overflow: auto !important; @@ -178,6 +180,99 @@ flex: 0; } + +@for $i from 0 through 50 { + .font-#{$i}-rem { + font-size: rem($i); + } + + .font-#{$i}-em { + font-size: em($i); + } +} + + +@for $i from 0 through 10 { + $size: $i * 5; + + $properties: "margin" "m", "padding" "p"; + + @each $property, $short in $properties { + + // ============================= EM ======================================== + // all directions + .#{$short}a-#{$size}-em { + #{$property}-left: em($size) !important; + #{$property}-right: em($size) !important; + #{$property}-top: em($size) !important; + #{$property}-bottom: em($size) !important; + } + // top + .#{$short}t-#{$size}-em { + #{$property}-top: em($size) !important + } + // bottom + .#{$short}b-#{$size}-em { + #{$property}-bottom: em($size) !important + } + // left + .#{$short}l-#{$size}-em { + #{$property}-left: em($size) !important + } + // right + .#{$short}r-#{$size}-em { + #{$property}-right: em($size) !important + } + // left and right + .#{$short}x-#{$size}-em { + #{$property}-left: em($size) !important; + #{$property}-right: em($size) !important; + } + // top and bottom + .#{$short}y-#{$size}-em { + #{$property}-top: em($size) !important; + #{$property}-bottom: em($size) !important; + } + + + // ============================= REM ======================================== + // all directions + .#{$short}a-#{$size}-rem { + #{$property}-left: rem($size) !important; + #{$property}-right: rem($size) !important; + #{$property}-top: rem($size) !important; + #{$property}-bottom: rem($size) !important; + } + // top + .#{$short}t-#{$size}-rem { + #{$property}-top: rem($size) !important + } + // bottom + .#{$short}b-#{$size}-rem { + #{$property}-bottom: rem($size) !important + } + // left + .#{$short}l-#{$size}-rem { + #{$property}-left: rem($size) !important + } + // right + .#{$short}r-#{$size}-rem { + #{$property}-right: rem($size) !important + } + // left and right + .#{$short}x-#{$size}-rem { + #{$property}-left: rem($size) !important; + #{$property}-right: rem($size) !important; + } + // top and bottom + .#{$short}y-#{$size}-rem { + #{$property}-top: rem($size) !important; + #{$property}-bottom: rem($size) !important; + } + + } +} + @media only screen and (min-width: 800px) { // overflow .v-application-md .overflow-md-auto { @@ -366,53 +461,6 @@ align-content: stretch !important; } - @for $i from 0 through 50 { - .font-md-#{$i} { - font-size: #{$i}px; - } - } - @for $i from 0 through 10 { - $size: $i * 5; - - $properties: "margin" "m", "padding" "p"; - - @each $property, $short in $properties { - // all directions - .#{$short}a-md-#{$size} { - #{$property}-left: #{$size}px !important; - #{$property}-right: #{$size}px !important; - #{$property}-top: #{$size}px !important; - #{$property}-bottom: #{$size}px !important; - } - // top - .#{$short}t-md-#{$size} { - #{$property}-top: #{$size}px !important; - } - // bottom - .#{$short}b-md-#{$size} { - #{$property}-bottom: #{$size}px !important; - } - // left - .#{$short}l-md-#{$size} { - #{$property}-left: #{$size}px !important; - } - // right - .#{$short}r-md-#{$size} { - #{$property}-right: #{$size}px !important; - } - // left and right - .#{$short}x-md-#{$size} { - #{$property}-left: #{$size}px !important; - #{$property}-right: #{$size}px !important; - } - // top and bottom - .#{$short}y-md-#{$size} { - #{$property}-top: #{$size}px !important; - #{$property}-bottom: #{$size}px !important; - } - } - } - .width-md-100 { width: 100%; } @@ -681,52 +729,6 @@ height: unset !important; } - @for $i from 0 through 50 { - .font-lg-#{$i} { - font-size: #{$i}px; - } - } - @for $i from 0 through 10 { - $size: $i * 5; - - $properties: "margin" "m", "padding" "p"; - - @each $property, $short in $properties { - // all directions - .#{$short}a-lg-#{$size} { - #{$property}-left: #{$size}px !important; - #{$property}-right: #{$size}px !important; - #{$property}-top: #{$size}px !important; - #{$property}-bottom: #{$size}px !important; - } - // top - .#{$short}t-lg-#{$size} { - #{$property}-top: #{$size}px !important; - } - // bottom - .#{$short}b-lg-#{$size} { - #{$property}-bottom: #{$size}px !important; - } - // left - .#{$short}l-lg-#{$size} { - #{$property}-left: #{$size}px !important; - } - // right - .#{$short}r-lg-#{$size} { - #{$property}-right: #{$size}px !important; - } - // left and right - .#{$short}x-lg-#{$size} { - #{$property}-left: #{$size}px !important; - #{$property}-right: #{$size}px !important; - } - // top and bottom - .#{$short}y-lg-#{$size} { - #{$property}-top: #{$size}px !important; - #{$property}-bottom: #{$size}px !important; - } - } - } } .m-l-auto { @@ -996,3 +998,8 @@ .cursor-pointer { cursor: pointer; } + + +.dnone { + display: none; +} \ No newline at end of file diff --git a/src/theme/variables.scss b/src/theme/variables.scss index bc94c59f6..14bf1878d 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -1,6 +1,7 @@ // Custom Theming for Angular Material // For more information: https://material.angular.io/guide/theming @import "~@angular/material/theming"; +@import '~src/function.scss'; // Plus imports for other components in your app. // Include the common styles for Angular Material. We include this here so that you only @@ -488,7 +489,7 @@ $app-theme: mat-light-theme( } .approve-event-time p { font-family: Roboto; - font-size: 13px; + font-size: rem(13) ; font-weight: normal; font-stretch: normal; font-style: normal; @@ -505,7 +506,7 @@ $app-theme: mat-light-theme( .approve-event-detail p { width: 250px; font-family: Roboto; - font-size: 13px; + font-size: rem(13); font-weight: normal; font-stretch: normal; font-style: normal; @@ -518,7 +519,7 @@ $app-theme: mat-light-theme( .approve-event-detail h3 { width: 250px; font-family: Roboto; - font-size: 15px; + font-size: rem(15); font-weight: bold; font-stretch: normal; font-style: normal; @@ -530,7 +531,7 @@ $app-theme: mat-light-theme( } .nav-icon { - font-size: 40px; + font-size: rem(40); } .btn-div { @@ -644,7 +645,7 @@ $app-theme: mat-light-theme( .label { border-radius: 20px; background: #ffb703; - font-size: 12px; + font-size: rem(12); float: right; padding: 2.5px 13.5px 2.5px 13.5px; color: #fff; diff --git a/version/git-version.ts b/version/git-version.ts index 9ae5a60cf..6420b836a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "bde8a32f4", - "SHA": "bde8a32f4d1e0f7720c6db9e546d084e1f6e4c08", - "branch": "developer", + "shortSHA": "89e11c6fe", + "SHA": "89e11c6fe47a65bfe2c3975c3558023a8de784a3", + "branch": "feature/mobile-viewport", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jun 30 10:44:41 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "5023", + "lastCommitTime": "'Fri Jun 30 10:49:33 2023 +0100'", + "lastCommitMessage": "merge", + "lastCommitNumber": "5035", "change": "", - "changeStatus": "On branch developer\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/services/contacts.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/environments/suport/oapr.ts\n\tnew file: src/firebase-config.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch feature/mobile-viewport\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/domain/process/DispatchDomain.ts\n\tmodified: src/app/home/home.page.html\n\tmodified: src/app/home/home.page.scss\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.scss\n\tmodified: src/app/modals/profile/profile.page.scss\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.scss\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/chat/chat.page.html\n\tmodified: src/app/pages/chat/chat.page.scss\n\tmodified: src/app/pages/chat/edit-group/edit-group.page.scss\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.scss\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.scss\n\tmodified: src/app/pages/chat/messages/messages.page.scss\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/chat/new-group/contacts/contacts.page.scss\n\tmodified: src/app/pages/chat/new-group/new-group.page.scss\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail-routing.module.ts\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.module.ts\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.page.html\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.page.scss\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.page.spec.ts\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.scss\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.scss\n\tmodified: src/app/services/theme.service.ts\n\tmodified: src/app/services/toast.service.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.scss\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss\n\tmodified: src/environments/suport/oapr.ts\n\tmodified: src/function.scss\n\tmodified: src/global.scss\n\tmodified: src/style/main.scss\n\tmodified: src/theme/variables.scss\n\tmodified: version/git-version.ts\n\tnew file: web.config", "changeAuthor": "peter.maquiran" } \ No newline at end of file diff --git a/web.config b/web.config new file mode 100644 index 000000000..81cc77a85 --- /dev/null +++ b/web.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file