diff --git a/package.json b/package.json index 63c179b6b..945a26926 100644 --- a/package.json +++ b/package.json @@ -199,4 +199,4 @@ "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" }, "license": "ISC" -} \ No newline at end of file +} 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 d9c9f25d7..b55fbaf7d 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -9,6 +9,7 @@
+
@@ -26,7 +27,7 @@
- +
@@ -71,6 +72,10 @@ +
+ +
+ @@ -112,4 +117,4 @@ - \ No newline at end of file + diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index d8d286465..9e5a7ce30 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -32,19 +32,21 @@

- {{ viewTitle }} + {{ viewTitle }}
+
- +

@@ -86,7 +88,7 @@
- +
@@ -103,6 +105,7 @@
+
@@ -119,11 +122,13 @@ @@ -187,11 +192,12 @@ @@ -205,6 +211,7 @@ @@ -438,7 +445,7 @@ (closeEventToApprove)="closeEventToApproveGoBack()" > - + + +
@@ -107,6 +114,13 @@ slot="end" src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg" > + +
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index d0e6f8046..3080ac852 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -329,9 +329,12 @@ ion-toolbar{ .schedule { max-width: 400px; font-family: Roboto; - background-color: white; - box-shadow: 0 0 10px 0 rgb(0 0 0 / 7%); - border: solid 1px #e9e9e9; + //background-color: white; + background-color: var(--box-container-color); + //box-shadow: 0 0 10px 0 rgb(0 0 0 / 7%); + box-shadow: 0 0 10px 0 var(--box-border-color-shadow); + //border: solid 1px #e9e9e9; + border: solid 1px var(--box-border-color); margin-bottom: 20px; border-radius: 25px; display: flex; @@ -380,10 +383,12 @@ ion-toolbar{ //padding-bottom: 5px; padding: 5px 20px 5px 20px; background-color: transparent !important; + } ion-list{ padding: 0px; margin: 0px; + background-color: transparent !important; .d-flex{ width: 100%; display: flex; @@ -397,8 +402,8 @@ ion-toolbar{ display: flex; justify-content: space-between; align-items: center; + background-color: transparent !important; --background: transparent !important; - .schedule-time{ margin-right: 10px; .time-start{ diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index f06f9417d..d827c28d3 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -14,6 +14,7 @@
+
{{ task.Folio}} @@ -22,6 +23,7 @@
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss index 8f8a6042f..4e0adc31b 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -37,7 +37,7 @@ margin: 2.5px 0 0 5px; display: flex; align-items: center; - + } .right{ padding: 0!important; @@ -70,7 +70,7 @@ margin: 1px; } } - + .title{ font-size: 25px; overflow: auto; @@ -100,7 +100,8 @@ ion-button{ .label{ border-radius: 20px; - background: #ffb703; + //background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; @@ -124,7 +125,7 @@ ion-button{ .bottom-content{ //width: 360px; margin: 0 auto; - + .bottom-content h3{ font-size: 16px; margin: 0 0 0 10px; @@ -166,7 +167,7 @@ ion-button{ display: flex; justify-content: flex-end; margin-bottom: 20px; - + .arrow-right-icon{ width: 37px; float: right; @@ -249,7 +250,7 @@ ion-button{ font-size: 13px; color: black; width: 100%; - + } .description{ font-family: Roboto; @@ -271,7 +272,7 @@ ion-button{ padding-bottom: unset !important; } } - + } @@ -319,7 +320,7 @@ ion-button{ .option-desc { display: flex; - color: #828282; + color: var(--profile-text-color) !important; width: 100%; justify-content: space-between; align-items: center; @@ -330,4 +331,4 @@ ion-button{ background-color: #e0e0e0; padding-left: 4px; } -} \ No newline at end of file +} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 0d1860bec..72057e5f5 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -50,6 +50,7 @@
+
@@ -113,6 +114,7 @@ +

Expediente

{{expedientegbstore.count}} Documentos

@@ -124,6 +126,7 @@ +

Pendentes

Meus Pendentes

@@ -135,6 +138,7 @@ +

Despacho do Presidente da República

Despachos criados por mim

@@ -146,6 +150,7 @@ +

Despachos

{{despachoStore.count}} Documentos

@@ -156,6 +161,7 @@ +

Pedidos de Parecer

Pedidos de Parecer solicitados por mim

@@ -167,6 +173,7 @@ +

Pedidos de Deferimento

{{pedidosstore.countdeferimento}} Documentos

@@ -192,6 +199,7 @@ +

Despacho do Presidente da República

@@ -205,6 +213,7 @@ +

Diplomas por Validar

Diplomas por Assinar

@@ -216,6 +225,7 @@ +

Diplomas assinados PR

Diplomas

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 3d96f2e64..718ba383c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -351,7 +351,7 @@ ion-list{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index a3b734557..391130886 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -8,16 +8,18 @@
-

Inicie a sessão

+

Gabinete Digital

+

Tribunal Constitucional

Email

@@ -28,7 +30,7 @@
- +
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index 055dc4e6b..39607a1b2 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -51,13 +51,14 @@ ion-content{ .bg-4{ width: 175px; height: 175px; - overflow: auto; + overflow: hidden; border-radius: 50%; padding: 15px; margin: auto; .bg-4 img{ width: 100%; + overflow: hidden; } } } @@ -67,7 +68,8 @@ ion-content{ width: 200px !important; margin: 0 auto; padding-bottom: 15px; - + overflow: hidden; + } .div-logo img{ width: 100%; @@ -91,7 +93,7 @@ ion-item{ margin: 15px 0 5px 0; font-size: 15px; } -.form-input{ +.form-input{ --background: #fff; --color:#000; border-radius: 22.5px; @@ -100,9 +102,11 @@ ion-item{ .btn-login{ font-size: 16px; + background-color: #F2F2F2 !important; + color: #000; } .btn-login:hover{ - background-color: var(--button-hover);; + background-color: var(--button-hover); } .div-top-header{ @@ -210,4 +214,4 @@ ion-item{ padding-top: 20px; position: unset !important; } -} \ No newline at end of file +} diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index af66c3640..1e6c1766f 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -23,10 +23,10 @@ -
+
-
+
@@ -50,7 +50,7 @@
-
+
@@ -63,7 +63,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -100,7 +100,7 @@
-
diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts index 885d7fed2..5f41e5515 100644 --- a/src/app/services/theme.service.ts +++ b/src/app/services/theme.service.ts @@ -8,17 +8,19 @@ export class ThemeService { themes = [ 'gov', - 'default' + 'default', + 'tribunal' ] currentTheme = 'gov' constructor(private storageservice: StorageService) { } - setTheme(theme: 'gov' | 'default') { + setTheme(theme: 'gov' | 'default' | 'tribunal') { document.body.classList.remove("gov"); document.body.classList.remove("default"); + document.body.classList.remove("tribunal"); document.body.classList.add(theme); this.currentTheme = theme console.log('Current theme', theme); diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss index ea368428a..d0b314011 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss @@ -133,7 +133,7 @@ ion-list{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 54b3467ea..5f12d2d70 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -7,16 +7,19 @@
+
{{this.notificationLength}}
+ {{loggeduser.Profile}}
@@ -27,6 +30,7 @@ logo logo + logo
@@ -37,6 +41,7 @@ + Início
@@ -45,6 +50,8 @@ [class.active]="locationPathname() == '/home/agenda'"> + + Agenda @@ -53,7 +60,7 @@ - + Gabinete @@ -61,6 +68,7 @@ [class.active]="locationPathname() == '/home/publications'"> + Acções @@ -68,6 +76,7 @@ [class.active]="locationPathname() == '/home/chat'"> + Chat @@ -78,10 +87,12 @@
+
@@ -96,6 +107,7 @@
+
@@ -105,6 +117,7 @@ +
@@ -120,4 +133,4 @@
- \ 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 5aa464101..24def0c06 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -57,6 +57,7 @@ font-weight: 300; width: fit-content; position: absolute; + color: var(--profile-text-color); } } .main-tab{ 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 35a65842e..3ca49f1b7 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.scss +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.scss @@ -60,4 +60,5 @@ .desk{ text-align: left; background-color: white; -} \ No newline at end of file + color: var(--profile-text-color); +} diff --git a/src/assets/images/theme/tribunal/icons-add.svg b/src/assets/images/theme/tribunal/icons-add.svg new file mode 100644 index 000000000..9b05da944 --- /dev/null +++ b/src/assets/images/theme/tribunal/icons-add.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/images/theme/tribunal/icons-arrow-circle-arrow-right-blue.svg b/src/assets/images/theme/tribunal/icons-arrow-circle-arrow-right-blue.svg new file mode 100644 index 000000000..fd5f80b31 --- /dev/null +++ b/src/assets/images/theme/tribunal/icons-arrow-circle-arrow-right-blue.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/theme/tribunal/icons-arrow-circle-arrow-right.svg b/src/assets/images/theme/tribunal/icons-arrow-circle-arrow-right.svg new file mode 100644 index 000000000..1d09d30c5 --- /dev/null +++ b/src/assets/images/theme/tribunal/icons-arrow-circle-arrow-right.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/theme/tribunal/icons-collaps-down.svg b/src/assets/images/theme/tribunal/icons-collaps-down.svg new file mode 100644 index 000000000..c1b2ca0ad --- /dev/null +++ b/src/assets/images/theme/tribunal/icons-collaps-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/tribunal/icons-collaps-up.svg b/src/assets/images/theme/tribunal/icons-collaps-up.svg new file mode 100644 index 000000000..dd5a217b2 --- /dev/null +++ b/src/assets/images/theme/tribunal/icons-collaps-up.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/tribunal/icons-profile-2.svg b/src/assets/images/theme/tribunal/icons-profile-2.svg new file mode 100644 index 000000000..54aa422f0 --- /dev/null +++ b/src/assets/images/theme/tribunal/icons-profile-2.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/theme/tribunal/icons-profile.svg b/src/assets/images/theme/tribunal/icons-profile.svg new file mode 100644 index 000000000..332899c29 --- /dev/null +++ b/src/assets/images/theme/tribunal/icons-profile.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/theme/tribunal/icons-received-event.svg b/src/assets/images/theme/tribunal/icons-received-event.svg new file mode 100644 index 000000000..855018197 --- /dev/null +++ b/src/assets/images/theme/tribunal/icons-received-event.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/images/theme/tribunal/icons-search.svg b/src/assets/images/theme/tribunal/icons-search.svg new file mode 100644 index 000000000..d3c6ba0ef --- /dev/null +++ b/src/assets/images/theme/tribunal/icons-search.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/images/theme/tribunal/tribunal-constitucional-logo.png b/src/assets/images/theme/tribunal/tribunal-constitucional-logo.png new file mode 100644 index 000000000..73b127278 Binary files /dev/null and b/src/assets/images/theme/tribunal/tribunal-constitucional-logo.png differ diff --git a/src/assets/images/theme/tribunal/tribunal-constitucional-logo.svg b/src/assets/images/theme/tribunal/tribunal-constitucional-logo.svg new file mode 100644 index 000000000..6afe4b26b --- /dev/null +++ b/src/assets/images/theme/tribunal/tribunal-constitucional-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/theme/tribunal/tribunal-constitucional.png b/src/assets/images/theme/tribunal/tribunal-constitucional.png new file mode 100644 index 000000000..1297a10ee Binary files /dev/null and b/src/assets/images/theme/tribunal/tribunal-constitucional.png differ diff --git a/src/global.scss b/src/global.scss index 9b9ecfed5..983721549 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1012,7 +1012,7 @@ background: rgb(92, 92, 92); // } .mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical), .cdk-keyboard-focused .mat-calendar-body-active > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical), .cdk-program-focused .mat-calendar-body-active > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical) { - background-color: #42b9fe36 !important; + background-color: var(--mat-selected-hover) !important; } .mat-form-field-underline.ng-tns-c193-6.ng-star-inserted, .mat-form-field-underline { @@ -1282,3 +1282,8 @@ ngx-mat-datetime-content{ .modal-background { background: #0000006b; } + + +.mat-option:hover:not(.mat-option-disabled), .mat-option:focus:not(.mat-option-disabled) { + background: var(--mat-selected-hover); +} diff --git a/src/theme/variables.scss b/src/theme/variables.scss index d6ffe2965..d88138a9c 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -488,9 +488,11 @@ $app-theme: mat-light-theme( margin: 0; padding: 0; } + .nav-icon { font-size: 40px; } + .btn-div { width: 390px; margin: 10px; @@ -511,6 +513,7 @@ $app-theme: mat-light-theme( background-color: var(--button-color); color: #ffffff !important; } + .btn-ok { width: 170px !important; height: 45px !important; @@ -544,8 +547,9 @@ $app-theme: mat-light-theme( padding: 0 !important; border-radius: 22.5px; background-color: var(--button-color); - color: #061b52 !important; + color: var(--button-text-color); margin: 0 auto !important; + //border: 1px solid var(--button-border-color) !important; } .btn-cancel:hover, @@ -623,34 +627,45 @@ body { --indicator-color-checked: transparent !important; } -.gov { +.tribunal { --ion-color-primary: #000; - --ion-color-secondary: #e4e8eb75; - --login-background: linear-gradient(180deg, #c63527 60%, #000 100%) !important; - --button-hover: #c63527; - --button-color: #ffb81c; - --button-text-color: #000; + --login-background: linear-gradient(180deg, #97CBE6 60%, #61BBEA 100%) !important; + --button-hover: #000; + --button-color: #ff0000; + --button-border-color: #c63527; + --button-text-color: #fff !important; + --button-text-color-hover: #fff !important; --inicio-open-page-from-box: #c63527; --header-tab-top-border: #000; --header-tab-text-white: rgb(0, 0, 0); --header-container-background: #fff; --header-bottom-line-background: rgb(255, 0, 0); - --header-bottom-line-background-image: linear-gradient(to right, #c63527, #ffb81c, #ffc72c); - --font-awesome: #ffb81c; + --header-bottom-line-background-image: linear-gradient(to right, #ff0000, #fd0000, #ff0000); + --font-awesome: #ff0000; --font-awesome-1: #c63527; - --mat-selected: #c63527; - --mat-calendar-body-selected: #c63527; - --monthview-selected: #c63527; - --color: #d9d9d9; - --color2: #f0f0f0; - --color3: #d9d9d9; - --color4: #d9d9d9ee; - --color5: #ececec; + --color: #97cae631; + --color2: #97cae631; + --color3: #97cae631; + --color4: #97cae631; + --color5: #97cae631; - --title-text-color: rgb(15, 15, 15); + --title-text-color: rgb(0, 0, 0); --subtitle-text-color: #000; + --label-bg-color: #000; + + --box-container-color: #fff; + --box-border-color: #e9e9e9; + --box-border-color-shadow: rgb(0 0 0 / 7%); + + /* --box-container-color: #97cae66e; + --box-border-color: #61BBEA; + --box-border-color-shadow: rgb(151 203 230 / 10%); */ + + /* --box-container-color: #F2F2F2; + --box-border-color: #ccc; + --box-border-color-shadow: rgb(242 242 242 / 10%); */ --gabinete-title-container: #fff; --gabinete-main-container: #fff; @@ -671,7 +686,79 @@ body { color: #000000; --color: #000000; } - + + .bg-1{ + background: #ffc72c38; + .bg-2{ + background: #ffc72c91; + .bg-3{ + background: #ffb71c91; + + .bg-4{ + + background: rgba(255, 255, 255, 0.918); + + } + } + } + } +} + +.gov { + --ion-color-primary: #000; + --ion-color-secondary: #e4e8eb75; + --login-background: linear-gradient(180deg, #c63527 60%, #000 100%) !important; + --button-hover: #c63527; + --button-color: #ffb81c; + --button-text-color: #000; + --inicio-open-page-from-box: #c63527; + + --header-tab-top-border: #000; + --header-tab-text-white: rgb(0, 0, 0); + --header-container-background: #fff; + --header-bottom-line-background: rgb(255, 0, 0); + --header-bottom-line-background-image: linear-gradient(to right, #c63527, #ffb81c, #ffc72c); + --font-awesome: #ffb81c; + --font-awesome-1: #c63527; + --mat-selected: #c63527; + --mat-selected-hover: #c634277e; + --mat-calendar-body-selected: #c63527; + --monthview-selected: rgb(198 53 39 / 49%); + + --color: #d9d9d9; + --color2: #f0f0f0; + --color3: #d9d9d9; + --color4: #d9d9d9ee; + --color5: #ececec; + + --title-text-color: rgb(15, 15, 15); + --subtitle-text-color: #000; + --label-bg-color: #ffb703; + + --box-container-color: #fff; + --box-border-color: #e9e9e9; + --box-border-color-shadow: rgb(0 0 0 / 7%); + + --gabinete-title-container: #fff; + --gabinete-main-container: #fff; + + --gabinete-active-hove-background: #C63527 !important; + --gabinete-active-hove-box-sizing: border-box; + + --box-hover-background-color: #e4e8eb75 !important; + --box-hover-background-border-color: 1px solid #ff4040 !important; + + --profile-text-color: #000000; + + .bg-blue { + --background: #ffffff; + background: #ffffff; + --background-color: #ffffff; + background-color: #ffffff; + color: #000000; + --color: #000000; + } + .bg-1{ background: #ffc72c38; .bg-2{ @@ -689,7 +776,7 @@ body { } } - + .default { --ion-color-primary: #3880ff; @@ -702,6 +789,7 @@ body { --header-tab-top-border: white; --header-tab-text-white: white; --mat-selected: #87cefa; + --mat-selected-hover: rgb(216 240 255); --mat-calendar-body-selected: #42b9fe ; --monthview-selected: lightskyblue; --header-container-background: linear-gradient( @@ -757,6 +845,7 @@ body { --title-text-color: #0d89d1; --subtitle-text-color: #000; + --label-bg-color: #ffb703; --gabinete-title-container: #ecf8ff; --gabinete-main-container: #ecf8ff; @@ -769,6 +858,11 @@ body { --profile-text-color: #ffffff; + + --box-container-color: #fff; + --box-border-color: #e9e9e9; + --box-border-color-shadow: rgb(0 0 0 / 7%); + .bg-blue { --background: #0782c9; background: #0782c9;