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/add-note/add-note.page.scss b/src/app/modals/add-note/add-note.page.scss index e16313d48..243d46be6 100644 --- a/src/app/modals/add-note/add-note.page.scss +++ b/src/app/modals/add-note/add-note.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .header-content{ width: 100% !important; padding: 30px 20px 0 20px !important; @@ -7,7 +9,7 @@ .header-title{ font-family: Roboto; -font-size: 25px; +font-size: rem(25); padding: 0; color:#000; float: left; @@ -30,11 +32,11 @@ float: left; margin: 0px auto; } .ion-icon-class{ - width: 45px; - height: 45px; + width: rem(45); + height: rem(45); float: left; padding: 10px; - font-size: 25px; + font-size: rem(25); } ion-select{ padding-left: 5px; @@ -42,7 +44,7 @@ float: left; } .ion-input-class{ width: calc(100% - 45px); - height: 45px; + height: rem(45); border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; @@ -56,17 +58,17 @@ float: left; } .add-people{ - width: 45px; + width: rem(45); float: right; overflow: auto; - font-size: 25px; + font-size: rem(25); } .list-people-title{ - /* font-size: 13px; */ + /* font-size: rem(13); */ color: #797979; } .attach-document{ - font-size: 15px; + font-size: rem(15); color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; @@ -74,23 +76,23 @@ float: left; } .attach-icon{ width: 37px; - font-size: 35px; + font-size: rem(35); float: left; } .attach-title-item{ width: 100%; - font-size: 15px; + font-size: rem(15); color:#0d89d1; } /* SPAN */ .span-left{ float: left; - font-size: 15x; + font-size: rem(15); } .span-right{ text-align: right; float: right; - font-size: 13px; + font-size: rem(13); } .container-footer{ @@ -98,16 +100,16 @@ float: left; overflow: auto; } .button-cancel { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #e0e9ee; --color: #061b52; margin:10px; } .button-save { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #42b9fe; --color:#ffffff; @@ -125,7 +127,7 @@ float: left; /* Error Messages */ .error{ color:red; - font-size: 12px; + font-size: rem(12); font-weight: bold; padding-bottom: 20px; } diff --git a/src/app/modals/chat-options-features/chat-options-features.page.scss b/src/app/modals/chat-options-features/chat-options-features.page.scss index 50f7690d2..52589ea7c 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.scss +++ b/src/app/modals/chat-options-features/chat-options-features.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .container{ --padding-top:20px !important; --padding-bottom:20px !important; @@ -10,7 +12,7 @@ .arrow-right-icon{ width: 37px; float: right; - font-size: 35px; + font-size: rem(35); overflow: hidden; } } diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss index 9b2d13eb1..a1ec48398 100644 --- a/src/app/modals/create-process/create-process.page.scss +++ b/src/app/modals/create-process/create-process.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .content{ padding: 30px 20px 0 20px !important; margin: 0; @@ -5,7 +7,7 @@ .title{ font-family: Roboto; - font-size: 25px; + font-size: rem(25); font-weight: normal; font-stretch: normal; font-style: normal; @@ -15,11 +17,11 @@ //margin: 8px 0 8px 0px; } .container-div{ - margin-bottom: 15px; + margin-bottom: rem(15); } .ion-item-container{ //width: 360px; - margin: 15px auto; + margin: rem(15) auto; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; @@ -33,11 +35,11 @@ margin: 0px auto; } .ion-icon-class{ - width: 45px; - height: 45px; + width: rem(45); + height: rem(45); float: left; padding: 10px; - font-size: 25px; + font-size: rem(25); } ion-select{ padding-left: 5px; @@ -63,52 +65,52 @@ } .add-people{ - width: 45px; + width: rem(45); float: right; overflow: auto; - font-size: 25px; - height: 45px; + font-size: rem(25); + height: rem(45); display: flex; } .list-people-title{ - /* font-size: 13px; */ + /* font-size: rem(13); */ color: #a3a3a3; } .attach-document{ - font-size: 15px; + font-size: rem(15); color: var(--title-text-color); } .attach-title-item{ width: 100%; - font-size: 15px; + font-size: rem(15); color:#0d89d1; } /* SPAN */ .span-left{ float: left; - font-size: 15x; + font-size: rem(15); } .span-right{ text-align: right; float: right; - font-size: 13px; + font-size: rem(13); } } .container-footer{ margin:0 auto; overflow: auto; .button-cancel { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #e0e9ee; --color: #061b52; margin:10px; } .button-save { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #42b9fe; --color:#ffffff; @@ -157,7 +159,7 @@ align-items: center; padding: 0px 5px; color: white; - font-size: 9pt; + font-size: rem(12); font-weight: 500; height: 19px; -webkit-border-radius: 18px; @@ -169,24 +171,25 @@ .attach-icon{ + width: 37px; - font-size: 35px; + font-size: rem(35); float: left; } .attach-title-item{ width: 100%; - font-size: 15px; + font-size: rem(15); color:#0d89d1; } /* SPAN */ .span-left{ float: left; - font-size: 15x; + font-size: rem(15); } .span-right{ text-align: right; float: right; -font-size: 13px; +font-size: rem(13); } .icon-time{ color: #797979b0; diff --git a/src/app/modals/dar-parecer/dar-parecer.page.scss b/src/app/modals/dar-parecer/dar-parecer.page.scss index c7b38786d..b3a137267 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.scss +++ b/src/app/modals/dar-parecer/dar-parecer.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .content-100{ padding: 0px 20px 0 20px !important; margin: 0; @@ -11,14 +13,14 @@ .header-title{ font-family: Roboto; - font-size: 25px; + font-size: rem(25); padding: 0; color:#000; float: left; } .ion-item-container{ - margin: 15px auto; + margin: rem(15) auto; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 10px; @@ -38,11 +40,11 @@ margin: 0px auto; } .ion-icon-class{ - width: 45px; - height: 45px; + width: rem(45); + height: rem(45); float: left; padding: 10px; - font-size: 25px; + font-size: rem(25); } ion-select{ padding-left: 5px; @@ -50,7 +52,7 @@ } .ion-input-class{ width: calc(100% - 45px); - height: 45px; + height: rem(45); border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; @@ -68,19 +70,19 @@ } .add-people{ - width: 45px; + width: rem(45); float: right; overflow: auto; - font-size: 25px; - height: 45px; + font-size: rem(25); + height: rem(45); display: flex; } .list-people-title{ - /* font-size: 13px; */ + /* font-size: rem(13); */ color: #797979; } .attach-document{ - font-size: 15px; + font-size: rem(15); color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; @@ -88,23 +90,23 @@ } .attach-icon{ width: 37px; - font-size: 35px; + font-size: rem(35); float: left; } .attach-title-item{ width: 100%; - font-size: 15px; + font-size: rem(15); color:#0d89d1; } /* SPAN */ .span-left{ float: left; - font-size: 15x; + font-size: rem(15); } .span-right{ text-align: right; float: right; - font-size: 13px; + font-size: rem(13); } .container-footer{ @@ -112,16 +114,16 @@ overflow: auto; } .button-cancel { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #e0e9ee; --color: #061b52; margin:10px; } .button-save { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #42b9fe; --color:#ffffff; @@ -139,7 +141,7 @@ /* Error Messages */ .error{ color:red; - font-size: 12px; + font-size: rem(12); font-weight: bold; padding-bottom: 20px; } diff --git a/src/app/modals/delegar/delegar.page.scss b/src/app/modals/delegar/delegar.page.scss index 50e91d6aa..80ffc60a8 100644 --- a/src/app/modals/delegar/delegar.page.scss +++ b/src/app/modals/delegar/delegar.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .content{ padding: 30px 20px 0 20px !important; margin: 0; @@ -9,14 +11,14 @@ .header-title{ font-family: Roboto; - font-size: 25px; + font-size: rem(25); padding: 0; color:#000; float: left; } .ion-item-container{ - margin: 15px auto; + margin: rem(15) auto; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 10px; @@ -35,11 +37,11 @@ margin: 0px auto; } .ion-icon-class{ - width: 45px; - height: 45px; + width: rem(45); + height: rem(45); float: left; padding: 10px; - font-size: 25px; + font-size: rem(25); } ion-select{ padding-left: 5px; @@ -47,7 +49,7 @@ } .ion-input-class{ width: calc(100% - 45px); - height: 45px; + height: rem(45); border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; @@ -65,19 +67,19 @@ } .add-people{ - width: 45px; + width: rem(45); float: right; overflow: auto; - font-size: 25px; - height: 45px; + font-size: rem(25); + height: rem(45); display: flex; } .list-people-title{ - /* font-size: 13px; */ + /* font-size: rem(13); */ color: #797979; } .attach-document{ - font-size: 15px; + font-size: rem(15); color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; @@ -85,23 +87,23 @@ } .attach-icon{ width: 37px; - font-size: 35px; + font-size: rem(35); float: left; } .attach-title-item{ width: 100%; - font-size: 15px; + font-size: rem(15); color:#0d89d1; } /* SPAN */ .span-left{ float: left; - font-size: 15x; + font-size: rem(15); } .span-right{ text-align: right; float: right; - font-size: 13px; + font-size: rem(13); } } .container-footer{ @@ -109,16 +111,16 @@ overflow: auto; } .button-cancel { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #e0e9ee; --color: #061b52; margin:10px; } .button-save { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #42b9fe; --color:#ffffff; @@ -136,7 +138,7 @@ /* Error Messages */ .error{ color:red; - font-size: 12px; + font-size: rem(12); font-weight: bold; padding-bottom: 20px; } diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index bcbe56f9d..533cd81da 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -42,7 +42,7 @@
-
Documentos Anexados
+
Documentos Anexados
- - - + + +
{{ fileName }}
diff --git a/src/app/modals/eliminate-event/eliminate-event.page.scss b/src/app/modals/eliminate-event/eliminate-event.page.scss index 0c8c7cac0..f6961f979 100644 --- a/src/app/modals/eliminate-event/eliminate-event.page.scss +++ b/src/app/modals/eliminate-event/eliminate-event.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + ion-content{ --padding-top:15px; --padding-start: 15px; @@ -11,7 +13,7 @@ ion-content{ } .header-title{ font-family: Roboto; - font-size: 20px; + font-size: rem(20); color:#000; margin: 0 5px 0 5px; } diff --git a/src/app/modals/forward/forward.page.scss b/src/app/modals/forward/forward.page.scss index 50e91d6aa..80ffc60a8 100644 --- a/src/app/modals/forward/forward.page.scss +++ b/src/app/modals/forward/forward.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .content{ padding: 30px 20px 0 20px !important; margin: 0; @@ -9,14 +11,14 @@ .header-title{ font-family: Roboto; - font-size: 25px; + font-size: rem(25); padding: 0; color:#000; float: left; } .ion-item-container{ - margin: 15px auto; + margin: rem(15) auto; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 10px; @@ -35,11 +37,11 @@ margin: 0px auto; } .ion-icon-class{ - width: 45px; - height: 45px; + width: rem(45); + height: rem(45); float: left; padding: 10px; - font-size: 25px; + font-size: rem(25); } ion-select{ padding-left: 5px; @@ -47,7 +49,7 @@ } .ion-input-class{ width: calc(100% - 45px); - height: 45px; + height: rem(45); border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; @@ -65,19 +67,19 @@ } .add-people{ - width: 45px; + width: rem(45); float: right; overflow: auto; - font-size: 25px; - height: 45px; + font-size: rem(25); + height: rem(45); display: flex; } .list-people-title{ - /* font-size: 13px; */ + /* font-size: rem(13); */ color: #797979; } .attach-document{ - font-size: 15px; + font-size: rem(15); color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; @@ -85,23 +87,23 @@ } .attach-icon{ width: 37px; - font-size: 35px; + font-size: rem(35); float: left; } .attach-title-item{ width: 100%; - font-size: 15px; + font-size: rem(15); color:#0d89d1; } /* SPAN */ .span-left{ float: left; - font-size: 15x; + font-size: rem(15); } .span-right{ text-align: right; float: right; - font-size: 13px; + font-size: rem(13); } } .container-footer{ @@ -109,16 +111,16 @@ overflow: auto; } .button-cancel { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #e0e9ee; --color: #061b52; margin:10px; } .button-save { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #42b9fe; --color:#ffffff; @@ -136,7 +138,7 @@ /* Error Messages */ .error{ color:red; - font-size: 12px; + font-size: rem(12); font-weight: bold; padding-bottom: 20px; } diff --git a/src/app/modals/information/information.page.scss b/src/app/modals/information/information.page.scss index 0c8c7cac0..f6961f979 100644 --- a/src/app/modals/information/information.page.scss +++ b/src/app/modals/information/information.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + ion-content{ --padding-top:15px; --padding-start: 15px; @@ -11,7 +13,7 @@ ion-content{ } .header-title{ font-family: Roboto; - font-size: 20px; + font-size: rem(20); color:#000; margin: 0 5px 0 5px; } diff --git a/src/app/modals/preview-camera/preview-camera.page.html b/src/app/modals/preview-camera/preview-camera.page.html index b8106bc61..15bfd8a57 100644 --- a/src/app/modals/preview-camera/preview-camera.page.html +++ b/src/app/modals/preview-camera/preview-camera.page.html @@ -4,8 +4,8 @@
-
- +
+
diff --git a/src/app/modals/preview-camera/preview-camera.page.scss b/src/app/modals/preview-camera/preview-camera.page.scss index 617ad8cd0..c258e0066 100644 --- a/src/app/modals/preview-camera/preview-camera.page.scss +++ b/src/app/modals/preview-camera/preview-camera.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + ion-footer { margin-bottom: 10px; } @@ -10,7 +12,7 @@ ion-slides { color: rgb(250, 250, 4); background-color: rgb(255, 238, 0); border-radius: 120px; - width: 30px; + width: rem(30); height: 30px; } .blacking{ @@ -62,7 +64,7 @@ float: right; height: 29px; margin: 3px 3px 3px 0; font-family: Roboto; - font-size: 20px; + font-size: rem(20); font-weight: normal; font-stretch: normal; font-style: normal; @@ -73,13 +75,12 @@ float: right; } .iconsarrowarrow-left { width: 36px; - height: 35px; + height: rem(35); padding: 9px 14px 8px 13px; object-fit: contain; } -CSS .Rectangle-Copy-5 { width: 400px; height: 60px; @@ -87,7 +88,6 @@ CSS background-color: #f9f9f9; } -CSS .Bitmap { width: 358px; height: 506px; @@ -99,7 +99,7 @@ CSS } .place{ float : left; -font-size: 14px; +font-size: rem(14); } .footer{ 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..b3a81fcf2 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(14); .user-role{ background-color: white; @@ -113,15 +115,15 @@ } .ion-icon-class{ color: #ebebeb; - width: 40px; - height: 40px; + width: rem(40); + height: rem(40); float: left; padding: 5px; - font-size: 25px; + font-size: rem(25); } .ion-input-class{ width: calc(100% - 40px); - height: 40px; + height: rem(40); border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; @@ -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/modals/set-room-owner/set-room-owner.page.scss b/src/app/modals/set-room-owner/set-room-owner.page.scss index 3bae06fd3..ca5e8fbcd 100644 --- a/src/app/modals/set-room-owner/set-room-owner.page.scss +++ b/src/app/modals/set-room-owner/set-room-owner.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .header-toolbar{ --background:transparent; --opacity: 1; @@ -15,9 +17,9 @@ transform: translate3d(0, 1px, 0); .div-icon{ - width: 40px; + width: rem(40); float: right; - font-size: 35px; + font-size: rem(35); overflow: auto; padding: 1px; } @@ -34,7 +36,7 @@ .back-icon{ width: 37px; float: left; - font-size: 35px; + font-size: rem(35); overflow: auto; } @@ -45,7 +47,7 @@ margin: 2.5px 0 0 5px; } .title{ - font-size: 25px; + font-size: rem(25); } } } @@ -86,7 +88,7 @@ .members-label{ margin: 10px 20px 10px 20px !important; - /* font-size: 15px; */ + /* font-size: rem(15); */ font-weight: bold; } @@ -105,7 +107,7 @@ .item-divider{ background: #ebebeb; - font-size: 15px; + font-size: rem(15); margin: 10px 0 10px 0; padding:5px 0 5px 20px; @@ -135,12 +137,12 @@ display: block; margin: 0 !important; padding-left: 10px; - font-size: 15px; + font-size: rem(15); color: var(--title-text-color); float: left; } .item-checkbox ion-icon, .members-checkbox ion-icon{ - font-size: 10px; + font-size: rem(10); float: left; color:#99e47b; margin-left: 10px; diff --git a/src/app/modals/view-event/view-event.page.html b/src/app/modals/view-event/view-event.page.html index e53b7f520..5c570a082 100644 --- a/src/app/modals/view-event/view-event.page.html +++ b/src/app/modals/view-event/view-event.page.html @@ -74,7 +74,7 @@
-
Intervenientes
+
Intervenientes
@@ -84,7 +84,7 @@
-
Detalhes
+
Detalhes
{{ loadedEvent.Body.Text }} 
@@ -93,7 +93,7 @@
-
Documentos Anexados
+
Documentos Anexados
diff --git a/src/app/modals/view-event/view-event.page.scss b/src/app/modals/view-event/view-event.page.scss index c23d2ca98..495418689 100644 --- a/src/app/modals/view-event/view-event.page.scss +++ b/src/app/modals/view-event/view-event.page.scss @@ -4,7 +4,7 @@ ion-content{ /* --padding-top:0px; --padding-start: 20px; --padding-end: 20px; - font-size: 18px; */ + font-size: rem(18); */ overflow: auto; } ion-menu{ @@ -31,7 +31,7 @@ ion-menu{ .left{ width: 37px; float: left; - font-size: 35px; + font-size: rem(35); } .middle{ width: calc(100% - 138.5px) !important; @@ -45,8 +45,8 @@ ion-menu{ } } .header-icon-right{ - width: 45px; - font-size: 45px; + width: rem(45); + font-size: rem(45); float: right; } .menu-options{ @@ -59,12 +59,12 @@ ion-menu{ margin-left: 15px; } .menu-options .edit{ - font-size: 35px; + font-size: rem(35); float: left; } .menu-options .delete{ padding: 7px; - font-size: 21px; + font-size: rem(21); color:#fff; background: #d30606; border-radius: 20px; @@ -73,7 +73,7 @@ ion-menu{ } .title{ - font-size: 25px; + font-size: rem(25); } } @@ -94,7 +94,7 @@ ion-menu{ .upper-content{ width: calc(100%-50px); margin-left: 50px; - font-size: 18px; + font-size: rem(18); .content-location{ width: 100%; @@ -113,7 +113,7 @@ ion-menu{ .location-detail{ width: 210px; font-weight: 700; - font-size: 18px; + font-size: rem(18); float: left; margin: 5px 5px 5px 0px; } @@ -149,7 +149,7 @@ ion-menu{ .button-calendar-type ion-button{ - height: 25px; + height: rem(25); } .button-edit-event { width: 140px; @@ -159,7 +159,7 @@ ion-menu{ --color:#061b52; } .content-details p{ - font-size: 16px; + font-size: rem(16); } } .line{ @@ -172,7 +172,7 @@ ion-menu{ overflow: auto; .middle-content h3, .middle-content p{ - font-size: 16px; + font-size: rem(16); } } @@ -180,11 +180,11 @@ ion-menu{ margin: 0 auto; .bottom-content h3{ - font-size: 16px; + font-size: rem(16); margin: 0 0 0 10px; } .attach-document{ - font-size: 15px; + font-size: rem(15); color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; @@ -192,23 +192,23 @@ ion-menu{ } .attach-icon{ width: 37px; - font-size: 35px; + font-size: rem(35); float: left; } .attach-title-item{ width: 100%; - font-size: 15px; + font-size: rem(15); color: var(--title-text-color); } /* SPAN */ .span-left{ float: left; - font-size: 15x; + font-size: rem(15); } .span-right{ text-align: right; float: right; - font-size: 13px; + font-size: rem(13); } } } @@ -223,7 +223,7 @@ ion-menu{ .arrow-right-icon{ width: 37px; float: right; - font-size: 35px; + font-size: rem(35); } } .buttons{ @@ -233,7 +233,7 @@ ion-menu{ .btn-ok, .btn-cancel, .btn-delete{ height: auto !important; - font-size: 16px !important; + font-size: rem(16) !important; width: 100% !important; margin-bottom: 10px !important; padding: 15px !important; diff --git a/src/app/modals/view-media/view-media.page.html b/src/app/modals/view-media/view-media.page.html index d34bc1d4d..00ff922f9 100644 --- a/src/app/modals/view-media/view-media.page.html +++ b/src/app/modals/view-media/view-media.page.html @@ -2,7 +2,7 @@
diff --git a/src/app/modals/view-media/view-media.page.scss b/src/app/modals/view-media/view-media.page.scss index 4185866b7..0ee31a634 100644 --- a/src/app/modals/view-media/view-media.page.scss +++ b/src/app/modals/view-media/view-media.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .main-header{ width: 100%; /* 400px */ height: 100%; @@ -13,12 +15,12 @@ .left{ width: fit-content; float: left; - //font-size: 35px; + //font-size: rem(35); overflow: hidden; .header-top-btn{ background: transparent; - font-size: 25px !important; + font-size: rem(25) !important; font-weight: 100 !important; /* color: #0782c9; */ color: #42b9fe; @@ -39,7 +41,7 @@ align-items: center; .title{ - font-size: 25px; + font-size: rem(25); white-space: nowrap; overflow: hidden !important; text-overflow: ellipsis !important; diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 0a975bf00..397ecde30 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..ae30cade3 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; + width: rem(40); 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; } @@ -201,7 +202,7 @@ input[type="checkbox"]::before{ position: absolute; content: ""; left: 0; - width: 30px; + width: rem(30); height: 30px; background: #fff; border-radius: 50%; @@ -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); } } @@ -341,7 +342,7 @@ td.monthview-primary-with-event { padding: 0px; li{ list-style: none; - height: 35px; + height: rem(35); display: flex; align-items: center; } @@ -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,13 +536,13 @@ td.monthview-primary-with-event { white-space: nowrap; overflow: hidden !important; text-overflow: ellipsis !important; - font-size: 17px; + font-size: rem(17); } } .color{ width: 5px; - height: 40px; + height: rem(40); border-top-right-radius: 5px; border-bottom-right-radius: 5px; background-color: #f05d5e; @@ -560,11 +561,11 @@ 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{ - font-size: 12pt; + font-size: rem(16); color: rgb(94, 92, 92); padding: 0 !important; margin: 0 !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/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss index 872268000..fdab03263 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.scss +++ b/src/app/pages/agenda/edit-event/edit-event.page.scss @@ -1,4 +1,5 @@ +@import '~src/function.scss'; .title-content::after, .header-md::after{ display: none; @@ -27,12 +28,12 @@ } .title{ - font-size: 25px; + font-size: rem(25); } } .ion-item-container{ - margin: 15px auto; + margin: rem(15) auto; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 10px; @@ -50,11 +51,11 @@ margin: 0px auto; } .ion-icon-class{ - width: 45px; - height: 45px; + width: rem(45); + height: rem(45); float: left; padding: 10px; - font-size: 25px; + font-size: rem(25); } ion-select{ padding-left: 5px; @@ -62,7 +63,7 @@ } .ion-input-class{ width: calc(100% - 45px); - height: 45px; + height: rem(45); border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; @@ -79,19 +80,19 @@ } .add-people{ - width: 45px; + width: rem(45); float: right; overflow: auto; - font-size: 25px; - height: 45px; + font-size: rem(25); + height: rem(45); display: flex; } .list-people-title{ - /* font-size: 13px; */ + /* font-size: rem(13); */ color: #a3a3a3; } .attach-document{ - font-size: 15px; + font-size: rem(15); color: var(--title-text-color);; margin: 5px 5px 5px 10px; padding: 5px; @@ -99,40 +100,40 @@ } .attach-icon{ width: 37px; - font-size: 35px; + font-size: rem(35); float: left; } .attach-title-item{ width: 100%; - font-size: 15px; + font-size: rem(15); color:var(--title-text-color); } /* SPAN */ .span-left{ float: left; - font-size: 15x; + font-size: rem(15); } .span-right{ text-align: right; float: right; - font-size: 13px; + font-size: rem(13); } .container-footer{ margin:0 auto; overflow: auto; } .button-cancel { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #e0e9ee; --color: #061b52; margin:10px; } .button-save { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #42b9fe; --color:#ffffff; @@ -150,7 +151,7 @@ /* Error Messages */ .error{ color:red; - font-size: 12px; + font-size: rem(12); font-weight: bold; padding-bottom: 20px; } @@ -176,7 +177,7 @@ align-items: center; padding: 0px 5px; color: white; - font-size: 9pt; + font-size: rem(12); font-weight: 500; height: 19px; -webkit-border-radius: 18px; diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss index 8b39f5213..6b40a423d 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .header-content{ //width: 360px; overflow: auto; @@ -5,7 +7,7 @@ } .header-icon-left{ width: 36px; - font-size: 33px; + font-size: rem(33); color: #42b9fe; float: left; } @@ -13,7 +15,7 @@ .header-title{ width: 264px; font-family: Roboto; - font-size: 25px; + font-size: rem(25); margin: 0 5px 10px 20px; padding: 0; color:#000; diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss index 6a310f377..3d5dfd2e1 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .wrapper{ --padding-top:20px !important; --padding-bottom:20px !important; @@ -10,7 +12,7 @@ .arrow-right-icon{ width: 37px; float: right; - font-size: 35px; + font-size: rem(35); overflow: hidden; } } 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..715fdc075 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; } @@ -30,7 +32,7 @@ ion-content{ } .title{ - font-size: 25px; + font-size: rem(25); } } @@ -66,18 +68,18 @@ ion-content{ margin: 0px auto; } .ion-icon-class{ - width: 45px; - height: 45px; + width: rem(45); + height: rem(45); float: left; padding: 10px; - font-size: 25px; + font-size: rem(25); } ion-select{ padding-left: 5px; margin-left: 0; } .ion-input-class{ - height: 45px; + height: rem(45); border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; @@ -100,19 +102,19 @@ ion-content{ } .add-people{ - width: 45px; + width: rem(45); float: right; overflow: auto; - font-size: 25px; - height: 45px; + font-size: rem(25); + height: rem(45); display: flex; } .list-people-title{ - /* font-size: 13px; */ + /* font-size: rem(13); */ color: #a3a3a3; } .attach-document{ - font-size: 15px; + font-size: rem(15); color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; @@ -120,39 +122,39 @@ ion-content{ } .attach-icon{ width: 37px; - font-size: 35px; + font-size: rem(35); float: left; } .attach-title-item{ width: 100%; - font-size: 15px; + font-size: rem(15); color:var(--title-text-color); } /* SPAN */ .span-left{ float: left; - font-size: 15x; + font-size: rem(15); } .span-right{ text-align: right; float: right; - font-size: 13px; + font-size: rem(13); } .container-footer{ margin:0 auto; overflow: auto; } .button-cancel { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #e0e9ee; --color: #061b52; margin:10px; } .button-save { - width: 170px; - height: 44px; + width: rem(170); + height: rem(44); border-radius: 22.5px; --background: #42b9fe; --color:#ffffff; @@ -170,7 +172,7 @@ ion-content{ /* Error Messages */ .error{ color:red; - font-size: 12px; + font-size: rem(12); font-weight: bold; padding-bottom: 20px; } @@ -191,7 +193,7 @@ ion-content{ align-items: center; padding: 0px 5px; color: white; - font-size: 9pt; + font-size: rem(12); font-weight: 500; height: 19px; -webkit-border-radius: 18px; 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..b13445238 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}}