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 415f853d6..5e735ad92 100644 --- a/src/app/pages/events/event-detail/event-detail.page.scss +++ b/src/app/pages/events/event-detail/event-detail.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + ion-item-group{ margin: 15px; } diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index fffc88abd..32f13c469 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -112,8 +112,8 @@ ion-item{ } .div-top-header{ - margin: 0 em(20px); - padding-top: em(15px); + margin: 0 em(20); + padding-top: em(15); border: 0!important; } diff --git a/src/app/services/events/events.page.scss b/src/app/services/events/events.page.scss index 600f18f3d..f1cd8a967 100644 --- a/src/app/services/events/events.page.scss +++ b/src/app/services/events/events.page.scss @@ -306,7 +306,7 @@ ion-toolbar{ margin-top: 15px; .meeting-time { - font-size: em(25px); + font-size: em(25); font-family: Roboto; font-weight: 300; color: var(--white); diff --git a/src/app/shared/agenda/approve-event/approve-event.page.scss b/src/app/shared/agenda/approve-event/approve-event.page.scss index 10acb4177..c5229f897 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.scss +++ b/src/app/shared/agenda/approve-event/approve-event.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .display-none-true{ display: none; border: 1px solid red; diff --git a/src/app/shared/agenda/event-list/event-list.page.scss b/src/app/shared/agenda/event-list/event-list.page.scss index 8b9e0c6de..d1d5147f4 100644 --- a/src/app/shared/agenda/event-list/event-list.page.scss +++ b/src/app/shared/agenda/event-list/event-list.page.scss @@ -1,3 +1,4 @@ +@import '~src/function.scss'; :host{ margin: 0; } diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index b9e78eb2b..cc6e8fc44 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + ion-content{ --background:transparent; --padding-top:0px; diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss index f1f4eec2d..fefe2d988 100644 --- a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .btn-modal-dismiss{ width: 37px; float: left; diff --git a/src/app/shared/btn-seguinte/btn-seguinte.page.scss b/src/app/shared/btn-seguinte/btn-seguinte.page.scss index bcc8034ff..a64260e99 100644 --- a/src/app/shared/btn-seguinte/btn-seguinte.page.scss +++ b/src/app/shared/btn-seguinte/btn-seguinte.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .right{ padding: 0!important; float: right; diff --git a/src/app/shared/chat/edit-group/edit-group.page.scss b/src/app/shared/chat/edit-group/edit-group.page.scss index 3d235ae32..c8b200b9f 100644 --- a/src/app/shared/chat/edit-group/edit-group.page.scss +++ b/src/app/shared/chat/edit-group/edit-group.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + ion-content{ --background:transparent; } diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss index 7180f00cf..b46583944 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .header-toolbar{ --background:transparent; --opacity: 1; diff --git a/src/app/shared/chat/messages/contacts/contacts.page.scss b/src/app/shared/chat/messages/contacts/contacts.page.scss index 3841bfa5d..84a35bed2 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.scss +++ b/src/app/shared/chat/messages/contacts/contacts.page.scss @@ -1,3 +1,4 @@ +@import '~src/function.scss'; .header-toolbar{ --background:transparent; diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.scss b/src/app/shared/chat/new-group/contacts/contacts.page.scss index 86a134b2d..95255004e 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.page.scss +++ b/src/app/shared/chat/new-group/contacts/contacts.page.scss @@ -1,3 +1,4 @@ +@import '~src/function.scss'; .header-toolbar{ --background:transparent; diff --git a/src/app/shared/chat/new-group/new-group.page.scss b/src/app/shared/chat/new-group/new-group.page.scss index 5bfd6c89d..d565c9fcb 100644 --- a/src/app/shared/chat/new-group/new-group.page.scss +++ b/src/app/shared/chat/new-group/new-group.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + ion-content{ --background:transparent; } diff --git a/src/app/shared/header-pr/header-pr.page.scss b/src/app/shared/header-pr/header-pr.page.scss index 630c41ad6..f7d457266 100644 --- a/src/app/shared/header-pr/header-pr.page.scss +++ b/src/app/shared/header-pr/header-pr.page.scss @@ -1,15 +1,15 @@ @import '~src/function.scss'; .div-top-header{ - margin: 0 em(20px); + margin: 0 em(20); background-color: #0782c9; - padding-top: em(15px); + padding-top: em(15); border: 0!important; } .div-logo{ background: transparent; - width: em(140px); + width: em(140); justify-content: center; display: flex; } diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss index a0a5e2b76..25b09a5ba 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -1,7 +1,7 @@ @import '~src/function.scss'; .div-top-header{ - margin: 0 em(20px); + margin: 0 em(20); // background-color: #0782c9; //padding-top: em(15px); border: 0!important; diff --git a/src/app/shared/pin/pin.page.scss b/src/app/shared/pin/pin.page.scss index cd5ee154a..4a41bbc45 100644 --- a/src/app/shared/pin/pin.page.scss +++ b/src/app/shared/pin/pin.page.scss @@ -1,14 +1,14 @@ @import '~src/function.scss'; .div-top-header{ - margin: 0 em(20px); - padding-top: em(15px); + margin: 0 em(20); + padding-top: em(15); border: 0!important; } .div-logo{ background: transparent; - width: em(140px); + width: em(140); justify-content: center; display: flex; } diff --git a/src/app/shared/popover/bad-request/bad-request.page.scss b/src/app/shared/popover/bad-request/bad-request.page.scss index 23f9bf5d5..61f55f27a 100644 --- a/src/app/shared/popover/bad-request/bad-request.page.scss +++ b/src/app/shared/popover/bad-request/bad-request.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + :host{ text-align: center; align-items: center; diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.scss b/src/app/shared/popover/deploma-options/deploma-options.page.scss index 6b6ce0444..9edf9f23e 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.scss +++ b/src/app/shared/popover/deploma-options/deploma-options.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .options-container{ --padding-top:20px !important; --padding-bottom:20px !important; diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.scss b/src/app/shared/popover/despachos-options/despachos-options.page.scss index 65edddd0e..46754f488 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.scss +++ b/src/app/shared/popover/despachos-options/despachos-options.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .options-container { --padding-top:20px !important; --padding-bottom:20px !important; diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.scss b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.scss index ec6f806cd..89b518e17 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.scss +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .options-container{ --padding-top:20px !important; --padding-bottom:20px !important; diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.scss b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.scss index 8a3c66977..22c26e431 100644 --- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.scss +++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .wrapper{ width: 100% !important; padding-top:20px !important; diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss index 0ca65079e..ebcde9a47 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .container{ --padding-top:20px !important; --padding-bottom:20px !important; diff --git a/src/app/shared/popover/messages-options/messages-options.page.scss b/src/app/shared/popover/messages-options/messages-options.page.scss index afb2b2a18..57caf8c39 100644 --- a/src/app/shared/popover/messages-options/messages-options.page.scss +++ b/src/app/shared/popover/messages-options/messages-options.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .container{ --padding-top:20px !important; --padding-bottom:20px !important; diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.scss b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.scss index 9b5da2205..63efe8920 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.scss +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .options-container{ --padding-top:20px !important; --padding-bottom:20px !important; diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.scss b/src/app/shared/popover/opts-expediente/opts-expediente.page.scss index b6a695761..121c5db26 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.scss +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .options-container{ --padding-top:20px !important; --padding-bottom:20px !important; diff --git a/src/app/shared/popover/success-message/success-message.page.scss b/src/app/shared/popover/success-message/success-message.page.scss index 23f9bf5d5..61f55f27a 100644 --- a/src/app/shared/popover/success-message/success-message.page.scss +++ b/src/app/shared/popover/success-message/success-message.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + :host{ text-align: center; align-items: center; diff --git a/src/app/tiny-mce/tiny-mce.page.scss b/src/app/tiny-mce/tiny-mce.page.scss index d13f62918..234cf007e 100644 --- a/src/app/tiny-mce/tiny-mce.page.scss +++ b/src/app/tiny-mce/tiny-mce.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + .left{ float: left; } diff --git a/version/git-version.ts b/version/git-version.ts index 5d8bed547..98981d328 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "1087e6869", - "SHA": "1087e6869051df8b4b3ccf3cb1b832be89c1b92d", + "shortSHA": "86f9e528e", + "SHA": "86f9e528e1326a6e17740ddd058657a2f19642fc", "branch": "merge-all", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Jul 12 13:54:20 2023 +0100'", - "lastCommitMessage": "add", - "lastCommitNumber": "5069", + "lastCommitTime": "'Wed Jul 12 15:15:02 2023 +0100'", + "lastCommitMessage": "fixe", + "lastCommitNumber": "5070", "change": "", - "changeStatus": "On branch merge-all\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/gallery/gallery.page.scss\n\tmodified: src/app/pages/publications/new-action/new-action.page.scss\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/publication/new-action/new-action.page.scss\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.scss\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.scss", + "changeStatus": "On branch merge-all\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/event-detail/event-detail.page.scss\n\tmodified: src/app/pages/login/login.page.scss\n\tmodified: src/app/services/events/events.page.scss\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.scss\n\tmodified: src/app/shared/agenda/event-list/event-list.page.scss\n\tmodified: src/app/shared/agenda/view-event/view-event.page.scss\n\tmodified: src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss\n\tmodified: src/app/shared/btn-seguinte/btn-seguinte.page.scss\n\tmodified: src/app/shared/chat/edit-group/edit-group.page.scss\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.scss\n\tmodified: src/app/shared/chat/new-group/contacts/contacts.page.scss\n\tmodified: src/app/shared/chat/new-group/new-group.page.scss\n\tmodified: src/app/shared/header-pr/header-pr.page.scss\n\tmodified: src/app/shared/header/header.page.scss\n\tmodified: src/app/shared/pin/pin.page.scss\n\tmodified: src/app/shared/popover/bad-request/bad-request.page.scss\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.scss\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.scss\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.scss\n\tmodified: src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.scss\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss\n\tmodified: src/app/shared/popover/messages-options/messages-options.page.scss\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.scss\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.scss\n\tmodified: src/app/shared/popover/success-message/success-message.page.scss\n\tmodified: src/app/tiny-mce/tiny-mce.page.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file