Merge branch 'themesDeveloper' of https://bitbucket.org/equilibriumito/gabinete-digital into themesDeveloper

This commit is contained in:
tiago.kayaya
2021-10-27 15:30:37 +01:00
6 changed files with 18 additions and 12 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ cordova plugin add cordova-plugin-mfp
ionic cordova plugin add cordova-plugin-network-information
## memory leak
set NODE_OPTIONS=--max_old_space_size=10096
set NODE_OPTIONS=--max_old_space_size=99996
```
## BUG
@@ -10,9 +10,7 @@
</button>
</div>
</div>
<div *ngIf="loggeduser.Profile =='MDGPR'" class="bottom-title d-flex">
<h3 class="bottom-text">Presidente da República</h3>
</div>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
@@ -33,7 +33,7 @@
.bottom-text{
font-size: 15px !important;
font-family: Roboto !important;
color: #0d89d1 !important;
color: var(--title-text-color) !important;
}
}
.item-list-small{
@@ -10,8 +10,8 @@
<div class="title-content d-flex pl-20">
<div class="back-icon cursor-pointer" (click)="goBack()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-30" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-30" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div>
<div class="div-title">
@@ -40,7 +40,7 @@
<div class="title-content">
<div class="back-icon cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div>
<div class="div-title">
<ion-label class="title"><ion-skeleton-text animated style="width: 60%;"></ion-skeleton-text></ion-label>
+4 -4
View File
@@ -54,13 +54,13 @@ td.monthview-primary-with-event {
// current date
td.monthview-current{
border-bottom: 1px solid lightskyblue !important;
border-bottom: 1px solid var(--monthview-selected) !important;
color: black !important;
background-color: white !important;
}
// selected date =============================
td.monthview-selected {
background-color: lightskyblue !important;
background-color: var(--monthview-selected) !important;
color: white !important;
}
@@ -1003,7 +1003,7 @@ background: rgb(92, 92, 92);
// calendar
.mat-calendar-body-selected {
background-color: #42b9fe !important;
background-color: var(--mat-calendar-body-selected) !important;
}
// select background
@@ -1073,7 +1073,7 @@ background: rgb(92, 92, 92);
.mat-selected {
background-color: #87cefa !important;
background-color: var(--mat-selected) !important;
span {
color: white !important;
}
+8
View File
@@ -706,6 +706,7 @@ body {
.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;
@@ -719,6 +720,9 @@ body {
--header-bottom-line-background-image: linear-gradient(to right, #c63527, #ffb81c, #ffc72c);
--font-awesome: #ffb81c;
--font-awesome-1: #c63527;
--mat-selected: #c63527;
--mat-calendar-body-selected: #c63527;
--monthview-selected: rgb(198 53 39 / 49%);
--color: #d9d9d9;
--color2: #f0f0f0;
@@ -775,6 +779,7 @@ body {
.default {
--ion-color-primary: #3880ff;
--ion-color-secondary: #e4e8eb75;
--login-background: linear-gradient(180deg, #42b9fe 0%, #0782c9 100%) !important;
--button-hover: #42b9fe;
--inicio-open-page-from-box: #42b9fe;
@@ -782,6 +787,9 @@ body {
--button-text-color: #white;
--header-tab-top-border: white;
--header-tab-text-white: white;
--mat-selected: #87cefa;
--mat-calendar-body-selected: #42b9fe ;
--monthview-selected: lightskyblue;
--header-container-background: linear-gradient(
270deg,
var(--color2) 0%,