diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 564db5b3e..996e1b413 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -400,7 +400,7 @@ const routes: Routes = [ loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule) }, ], - canActivate: [InactivityGuard] + // canActivate: [InactivityGuard] }, ]; 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 a26270b9b..461e53b4e 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 @@ -111,7 +111,7 @@
-
+
diff --git a/src/app/pages/inactivity/inactivity.page.html b/src/app/pages/inactivity/inactivity.page.html index b34e1a58a..5f8114855 100644 --- a/src/app/pages/inactivity/inactivity.page.html +++ b/src/app/pages/inactivity/inactivity.page.html @@ -42,11 +42,11 @@
-
+
Entrar com senha
-
+
Limpar
diff --git a/src/app/pages/inactivity/inactivity.page.scss b/src/app/pages/inactivity/inactivity.page.scss index e8ba842b8..3cd90e111 100644 --- a/src/app/pages/inactivity/inactivity.page.scss +++ b/src/app/pages/inactivity/inactivity.page.scss @@ -9,12 +9,11 @@ ion-content{ } .main-wrapper{ - background: var(--login-background); + background: var(--PinBackground); display: flex; width: 100vw; height: 100vh; overflow: auto; - background: white !important; display: flex; align-items: center; justify-content: center; @@ -142,7 +141,7 @@ ion-item{ align-items: center; justify-content: center; font-size: 19pt; - background: #44b5ea; + background: var(--PinDots);; border-radius: 56px; margin-bottom: 15px; user-select: none; @@ -163,7 +162,7 @@ ion-item{ justify-content: center; display: flex; flex-direction: column; - background-image: url(/assets/background/auth.svg); + background-image: var(--PinCircleBackground); background-position: center; background-repeat: no-repeat; width: 100%; @@ -172,19 +171,20 @@ ion-item{ } .clear{ - color: #44b5ea; + color: var(--PinTextColor); font-size: 12pt; z-index: 1000; } + .dot-active{ - background: #44b5ea; + background: var(--PinDots); } .dot{ width: 25px; height: 25px; margin: 0 10px 0 0; - border: 3px solid #44b5ea; + border: 3px solid var(--PinDots); box-sizing: border-box; border-radius: 50px; -webkit-border-radius: 50px; diff --git a/src/global.scss b/src/global.scss index 60aff4c0b..0dcae205f 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1235,7 +1235,7 @@ ngx-mat-datetime-content{ .loading-blocker { .loading-blocker-container { - width: 250px; + width: 196px; } } } @@ -1297,4 +1297,6 @@ ngx-mat-datetime-content{ .add-people { align-items: center; height: 45px; -} \ No newline at end of file +} + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index b9d52a1e0..a4271f04d 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -588,9 +588,11 @@ $app-theme: mat-light-theme( color: #061b52 !important; margin: 0 auto !important; } + .btn-no-color { background-color: #fff; } + .exp-workflow { float: left; margin-left: 15px; @@ -627,6 +629,7 @@ body { --indicator-color: transparent !important; --indicator-color-checked: transparent !important; } + .yellow-orange{ color: #ffb703 !important; } @@ -647,8 +650,12 @@ body { --header-container-background: #fff; --header-bottom-line-background: rgb(255, 0, 0); --header-bottom-line-background-image: linear-gradient(to right, #ff0000, #fd0000, #ff0000); - --font-awesome: #ff0000; + --font-awesome: #f7dddd; --font-awesome-1: #c63527; + --PinDots: #44b5ea; + --PinCircleBackground: url(/auth.svg); + --PinBackground: #e1e7eb; + --PinTextColor: #44b5ea; --color: #97cae631; --color2: #97cae631; @@ -721,6 +728,7 @@ body { --button-color: #ffb81c; --button-text-color: white; --inicio-open-page-from-box: #c63527; + --PinBackground: #e1e7eb; --header-tab-top-border: #000; --header-tab-text-white: rgb(0, 0, 0); @@ -733,6 +741,9 @@ body { --mat-selected-hover: #c634277e; --mat-calendar-body-selected: #c63527; --monthview-selected: rgb(198 53 39 / 49%); + --PinDots: #c63527; + --PinTextColor: black; + --PinCircleBackground: url(/auth.svg); --color: #d9d9d9; --color2: #f0f0f0; @@ -802,6 +813,12 @@ body { --mat-selected-hover: rgb(216 240 255); --mat-calendar-body-selected: #42b9fe ; --monthview-selected: lightskyblue; + + --PinDots: #44b5ea; + --PinTextColor: #44b5ea; + --PinCircleBackground: url(/assets/background/auth.svg); + --PinBackground: white !important; + --header-container-background: linear-gradient( 270deg, var(--color2) 0%,