diff --git a/config.xml b/config.xml index 2065b02f4..2d99e1325 100644 --- a/config.xml +++ b/config.xml @@ -1,9 +1,9 @@ - gabinete digital + Gabinete digital An awesome Ionic/Cordova app. Ionic Framework Team - + @@ -39,6 +39,12 @@ + + + + + + 1109370933 diff --git a/package.json b/package.json index 0bdfa0c52..dd62807a4 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/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index d36c1a33e..04e311da6 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index 23cb8318e..aa2ff071a 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index 2797056eb..2cf429a73 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index a681d641b..bacfb6af4 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index 75f41540d..de1e489c7 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index df3b5433c..3491a1569 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png index 56df3990c..4c5cfeb31 100644 Binary files a/resources/android/splash/drawable-land-hdpi-screen.png and b/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png index 0a005cbc7..4a0858c56 100644 Binary files a/resources/android/splash/drawable-land-ldpi-screen.png and b/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png index 9d47a4334..41aa328f3 100644 Binary files a/resources/android/splash/drawable-land-mdpi-screen.png and b/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png index ce457f4f0..872a0d064 100644 Binary files a/resources/android/splash/drawable-land-xhdpi-screen.png and b/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png index cad67a35a..2838f1baf 100644 Binary files a/resources/android/splash/drawable-land-xxhdpi-screen.png and b/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png index 0eb63db93..5b8481c1d 100644 Binary files a/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png index 07cd4e011..5c153233a 100644 Binary files a/resources/android/splash/drawable-port-hdpi-screen.png and b/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png index 237209d9d..e21dcb7d5 100644 Binary files a/resources/android/splash/drawable-port-ldpi-screen.png and b/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png index 3067c9c5c..e31515340 100644 Binary files a/resources/android/splash/drawable-port-mdpi-screen.png and b/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png index 069494e9b..c55faaef7 100644 Binary files a/resources/android/splash/drawable-port-xhdpi-screen.png and b/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png index c0ac7ccff..22b0a9094 100644 Binary files a/resources/android/splash/drawable-port-xxhdpi-screen.png and b/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png index bebfc65ab..4d3b27c1c 100644 Binary files a/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/resources/icon.png b/resources/icon.png index 64ef20966..386df1e6c 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/resources/splash.png b/resources/splash.png index 6ceb5b008..ef651e015 100644 Binary files a/resources/splash.png and b/resources/splash.png differ diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index 869649154..f0d364001 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -133,7 +133,7 @@ display: flex; width: fit-content; height: auto; - background: #fef4c5; + background: var(--chat-alert-msg-color); text-align: center; font-size: 13px; color: #262420; @@ -202,11 +202,11 @@ } .incoming-false{ margin: 10px 20px 10px 75px; - background: #e4f4fe; + background: var(--chat-incoming-msg-color); float: right; } .title{ - color: #0782c9; + color: var(--title-text-color); font-weight: bold; margin-bottom: 5px; diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss index 264f55f42..8555d1822 100644 --- a/src/app/pages/chat/messages/messages.page.scss +++ b/src/app/pages/chat/messages/messages.page.scss @@ -173,12 +173,12 @@ } .incoming-false{ margin: 10px 20px 10px 75px; - background: #e4f4fe; + background: var(--chat-incoming-msg-color); float: right; } .title{ display: inline; - color: #0782c9; + color: var(--title-text-color); font-weight: bold; margin-bottom: 5px; diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index 39607a1b2..c1765a679 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -67,8 +67,7 @@ ion-content{ .div-logo{ width: 200px !important; margin: 0 auto; - padding-bottom: 15px; - overflow: hidden; + padding: 15px !important; } .div-logo img{ diff --git a/src/app/shared/btn-seguinte/btn-seguinte.page.scss b/src/app/shared/btn-seguinte/btn-seguinte.page.scss index bc35e6d03..617cd84ef 100644 --- a/src/app/shared/btn-seguinte/btn-seguinte.page.scss +++ b/src/app/shared/btn-seguinte/btn-seguinte.page.scss @@ -2,6 +2,6 @@ padding: 0!important; float: right; font-size: 15px; - color: #0782c9; + color: var(--title-text-color); margin: 8px 0 0 5px; } \ No newline at end of file diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss index 30facfa18..6da1f2026 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.scss +++ b/src/app/shared/chat/group-messages/group-messages.page.scss @@ -100,7 +100,7 @@ .info-text{ /* width: 322px; */ width: em(422px); - background: #fef4c5; + background: var(--chat-alert-msg-color); text-align: center; font-size: 13px; color: #262420; @@ -160,12 +160,12 @@ } .incoming-false{ margin: 10px 20px 10px 75px; - background: #e4f4fe; + background: var(--chat-incoming-msg-color); float: right; } .title{ display: inline; - color: #0782c9; + color: var(--title-text-color); font-weight: bold; margin-bottom: 5px; diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss index 127bf4a5c..ea06e1748 100644 --- a/src/app/shared/chat/messages/messages.page.scss +++ b/src/app/shared/chat/messages/messages.page.scss @@ -136,12 +136,12 @@ } .incoming-false{ margin: 10px 20px 10px 75px; - background: #e4f4fe; + background: var(--chat-incoming-msg-color); float: right; } .title{ display: inline; - color: #0782c9; + color: var(--title-text-color); font-weight: bold; margin-bottom: 5px; diff --git a/src/global.scss b/src/global.scss index 983721549..053a8ea50 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1135,7 +1135,7 @@ ngx-mat-datetime-content{ .incoming-false:hover{ .message-options-icon{ display: block; - background-color: #e4f4fe; + background-color: var(--chat-incoming-msg-color); } } } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index f52e999d6..ac8495a72 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -709,6 +709,8 @@ body { } .gov { + --chat-alert-msg-color: #e0e9ee; + --chat-incoming-msg-color: #fff3da; --ion-color-primary: #000; --ion-color-secondary: #e4e8eb75; --login-background: linear-gradient(180deg, #c63527 60%, #000 100%) !important; @@ -781,6 +783,8 @@ body { } .default { + --chat-alert-msg-color: #fef4c5; + --chat-incoming-msg-color: #e4f4fe; --ion-color-primary: #3880ff; --ion-color-secondary: #e4e8eb75; --login-background: linear-gradient(180deg, #42b9fe 0%, #0782c9 100%) !important;