peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'themesDeveloper' into developer

Browse Source
This commit is contained in:
Peter Maquiran
2021-10-28 14:55:47 +01:00
parent cff1bdf5e6 f1307949b1
commit 0fc90706b1
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/search/search.page.html
+4 -4
View File
@@ -48,8 +48,8 @@
<div class="icon-mer icon"> <div class="icon-mer icon">
<ion-icon name="restaurant-outline" src="assets/images/icons-advance-search-document.svg"></ion-icon> <ion-icon name="restaurant-outline" src="assets/images/icons-advance-search-document.svg"></ion-icon>
</div> </div>
<div class="input-container d-flex ion-align-items-center"> <div class="input-container d-flex ion-align-items-">
<ion-datetime [(ngModel)]='searchDocumentDate' placeholder="Data" display-timezone="utc"></ion-datetime> <ion-datetime class="cursor-pointer" [(ngModel)]='searchDocumentDate' placeholder="Data" display-timezone="utc"></ion-datetime>
<div class="icon cursor-pointer" (click)="clearInputDocumentDate()"> <div class="icon cursor-pointer" (click)="clearInputDocumentDate()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
@@ -62,7 +62,7 @@
<ion-icon name="restaurant-outline" src="assets/images/icons-advance-search-sender.svg"></ion-icon> <ion-icon name="restaurant-outline" src="assets/images/icons-advance-search-sender.svg"></ion-icon>
</div> </div>
<div class="input-container d-flex ion-align-items-center"> <div class="input-container d-flex ion-align-items-center">
<ion-input [(ngModel)]='searchSender' class="search-input" (click)="openAdvanceSearchSelection()" type="search" placeholder="Remetentes"></ion-input> <ion-input [(ngModel)]='searchSender' class="search-input cursor-pointer" (click)="openAdvanceSearchSelection()" type="search" placeholder="Remetentes"></ion-input>
<div class="icon cursor-pointer" (click)="clearInputRemetente()" > <div class="icon cursor-pointer" (click)="clearInputRemetente()" >
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
@@ -75,7 +75,7 @@
<ion-icon name="restaurant-outline" src="assets/images/icons-arrow-arrow-down-25-copy.svg"></ion-icon> <ion-icon name="restaurant-outline" src="assets/images/icons-arrow-arrow-down-25-copy.svg"></ion-icon>
</div> </div>
<div class="input-container d-flex ion-align-items-center"> <div class="input-container d-flex ion-align-items-center">
<ion-input [(ngModel)]='searchOrganicEntiry' class="search-input" type="search" placeholder="Entidade Orgânica" (click)="openOrganicEntitySelection()"></ion-input> <ion-input [(ngModel)]='searchOrganicEntiry' class="search-input custom-checkbox" type="search" placeholder="Entidade Orgânica" (click)="openOrganicEntitySelection()"></ion-input>
<div class="icon cursor-pointer" (click)="clearInputOrganicEntity()" > <div class="icon cursor-pointer" (click)="clearInputOrganicEntity()" >
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
src/assets/www/pdfjs/web/viewer.html
+1 -1
View File
@@ -35,7 +35,7 @@
console.log(event) console.log(event)
if (event.data && event.data.sender == "cookies") { if (event.data && event.data.sender == "cookies") {
// setCookie()
} }
}); });
src/theme/variables.scss
+2 -4
View File
@@ -711,7 +711,7 @@ body {
--login-background: linear-gradient(180deg, #c63527 60%, #000 100%) !important; --login-background: linear-gradient(180deg, #c63527 60%, #000 100%) !important;
--button-hover: #c63527; --button-hover: #c63527;
--button-color: #ffb81c; --button-color: #ffb81c;
--button-text-color: #000; --button-text-color: white;
--inicio-open-page-from-box: #c63527; --inicio-open-page-from-box: #c63527;
--header-tab-top-border: #000; --header-tab-top-border: #000;
@@ -777,8 +777,6 @@ body {
} }
} }
.default { .default {
--ion-color-primary: #3880ff; --ion-color-primary: #3880ff;
--ion-color-secondary: #e4e8eb75; --ion-color-secondary: #e4e8eb75;
@@ -786,7 +784,7 @@ body {
--button-hover: #42b9fe; --button-hover: #42b9fe;
--inicio-open-page-from-box: #42b9fe; --inicio-open-page-from-box: #42b9fe;
--button-color: #e0e9ee; --button-color: #e0e9ee;
--button-text-color: #white; --button-text-color: white;
--header-tab-top-border: white; --header-tab-top-border: white;
--header-tab-text-white: white; --header-tab-text-white: white;
--mat-selected: #87cefa; --mat-selected: #87cefa;