diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index 32b1c8201..ddd2e4f9b 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -59,12 +59,20 @@
- + + + +
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 83b920a9f..6d30dbe3a 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -2,12 +2,15 @@
- + @@ -15,21 +18,24 @@
logo logo - logo + logo
-
+
-

{{ environment.logoLabel }}

- +

{{ environment.logoLabel }}

+
-

GABINETE DIGITAL

+

GABINETE DIGITAL

-
+
-

{{ environment.logoLabel }}

+

{{ environment.logoLabel }}

-

GABINETE DIGITAL

+

GABINETE DIGITAL

@@ -37,14 +43,20 @@
- + + + + +
-
- {{notificationLength}}
+
+ {{notificationLength}}
@@ -54,18 +66,20 @@ -
+
-
- - + + Início
-
- - + + Agenda
-
- - + + Gabinete
-
- - + + Acções
-
- - + + Chat
@@ -123,13 +154,19 @@
- - - + + +
-
@@ -141,30 +178,38 @@
- + -
+
+ + - -
- + + + + + + +
-
- {{notificationLength}}
+
+ {{notificationLength}}
@@ -174,5 +219,5 @@
-
-
+
+ \ No newline at end of file diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss index 25b09a5ba..cbf068614 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -7,6 +7,15 @@ border: 0!important; } + + + .profile-image { + border-radius: 80%; /* Tornar a imagem circular */ + width: 25.33%; + height: 25.33%; + overflow: auto; + } + .div-logo{ background: transparent; width: em(140); diff --git a/src/assets/images/ministro.png b/src/assets/images/ministro.png new file mode 100644 index 000000000..74f15e1d7 Binary files /dev/null and b/src/assets/images/ministro.png differ diff --git a/src/assets/images/presidente.jpeg b/src/assets/images/presidente.jpeg deleted file mode 100644 index 105c92c04..000000000 Binary files a/src/assets/images/presidente.jpeg and /dev/null differ diff --git a/src/assets/images/presidente.png b/src/assets/images/presidente.png new file mode 100644 index 000000000..4049a501f Binary files /dev/null and b/src/assets/images/presidente.png differ diff --git a/src/assets/images/secretaria_geral.png b/src/assets/images/secretaria_geral.png new file mode 100644 index 000000000..9cb12ba25 Binary files /dev/null and b/src/assets/images/secretaria_geral.png differ diff --git a/version/git-version.ts b/version/git-version.ts index 1e196e71d..82a1c9507 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "471d05653", - "SHA": "471d05653d40a9c316a6bdcbdce15d9e552d25c0", + "shortSHA": "eb82f5a43", + "SHA": "eb82f5a4302404f86edd52f0a64de252949d83ba", "branch": "developer", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Fri Aug 18 20:27:37 2023 +0100'", - "lastCommitMessage": "users picture added", - "lastCommitNumber": "5171", + "lastCommitTime": "'Fri Aug 18 21:17:57 2023 +0100'", + "lastCommitMessage": "merge with developer_prod", + "lastCommitNumber": "5174", "change": "", - "changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 2 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts", + "changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 5 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.scss\n\tnew file: src/assets/images/ministro.png\n\tdeleted: src/assets/images/presidente.jpeg\n\tnew file: src/assets/images/presidente.png\n\tnew file: src/assets/images/secretaria_geral.png", "changeAuthor": "eudes.inacio" } \ No newline at end of file