diff --git a/package.json b/package.json index dd62807a4..0bdfa0c52 100644 --- a/package.json +++ b/package.json @@ -209,4 +209,4 @@ "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" }, "license": "ISC" -} +} \ No newline at end of file diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0cfd110dd..05cf78fd0 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -8,6 +8,7 @@ import * as _rollupMoment from 'moment'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; const moment = _rollupMoment || _moment; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { @@ -35,7 +36,8 @@ export class AppComponent { constructor( private platform: Platform, /* private splashScreen: SplashScreen, */ - private statusBar: StatusBar + private statusBar: StatusBar, + private screenOrientation: ScreenOrientation ) { this.initializeApp(); } @@ -44,6 +46,12 @@ export class AppComponent { this.platform.ready().then(() => { this.statusBar.styleDefault(); /* this.splashScreen.hide(); */ + + if (this.platform.is("tablet")) { + this.screenOrientation.unlock(); + } else if( this.platform.is("mobile")) { + this.screenOrientation.lock(this.screenOrientation.ORIENTATIONS.PORTRAIT_PRIMARY); + } }); } } diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 67674d637..29b5a962a 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -24,6 +24,7 @@ import { BackgroundService } from 'src/app/services/background.service'; import { OfflineManagerService } from 'src/app/services/offline-manager.service'; import { Storage } from '@ionic/storage'; import { EventsService } from 'src/app/services/events.service'; +import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; @Component({ @@ -84,7 +85,8 @@ export class HomePage implements OnInit { private backgroundservice: BackgroundService, private offlinemanager: OfflineManagerService, private storage: Storage, - private eventservice: EventsService) { + private eventservice: EventsService, + private screenOrientation: ScreenOrientation) { this.webNotificationPopupService.askNotificationPermission() diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 1e6c1766f..9c9c2b413 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -27,7 +27,8 @@
- + +
@@ -48,8 +49,8 @@
-
- +
+
@@ -62,7 +63,7 @@
- +
@@ -75,7 +76,7 @@
- +
diff --git a/src/assets/icon/theme/gov/icons-chat-send.svg b/src/assets/icon/theme/gov/icons-chat-send.svg index cd0ae4e61..ab4457c38 100644 --- a/src/assets/icon/theme/gov/icons-chat-send.svg +++ b/src/assets/icon/theme/gov/icons-chat-send.svg @@ -1,7 +1,7 @@ - - + + - - + + diff --git a/src/assets/icon/theme/gov/icons-most-searched-words-open.svg b/src/assets/icon/theme/gov/icons-most-searched-words-open.svg new file mode 100644 index 000000000..f26180425 --- /dev/null +++ b/src/assets/icon/theme/gov/icons-most-searched-words-open.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/images/theme/gov/advance-search-show-modal.svg b/src/assets/images/theme/gov/advance-search-show-modal.svg new file mode 100644 index 000000000..f26180425 --- /dev/null +++ b/src/assets/images/theme/gov/advance-search-show-modal.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/www/pdfjs/web/viewer.html b/src/assets/www/pdfjs/web/viewer.html index 0d7dfbf13..732317389 100644 --- a/src/assets/www/pdfjs/web/viewer.html +++ b/src/assets/www/pdfjs/web/viewer.html @@ -35,7 +35,7 @@ console.log(event) if (event.data && event.data.sender == "cookies") { - + // setCookie() } }); diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 8ca5f0eb3..f52e999d6 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -714,7 +714,7 @@ body { --login-background: linear-gradient(180deg, #c63527 60%, #000 100%) !important; --button-hover: #c63527; --button-color: #ffb81c; - --button-text-color: #000; + --button-text-color: white; --inicio-open-page-from-box: #c63527; --header-tab-top-border: #000; @@ -780,8 +780,6 @@ body { } } - - .default { --ion-color-primary: #3880ff; --ion-color-secondary: #e4e8eb75; @@ -789,7 +787,7 @@ body { --button-hover: #42b9fe; --inicio-open-page-from-box: #42b9fe; --button-color: #e0e9ee; - --button-text-color: #white; + --button-text-color: white; --header-tab-top-border: white; --header-tab-text-white: white; --mat-selected: #87cefa;