From d6f9db53ca9c5aae688301cf06fc630e92418ed1 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 15 Aug 2023 17:12:50 +0100 Subject: [PATCH] fix --- src/app/pages/agenda/agenda.page.scss | 61 +--------------- .../agenda/new-event/new-event.module.ts | 5 +- .../agenda/new-event/new-event.page.html | 14 ++-- src/global.scss | 71 +++++++++---------- version/git-version.ts | 10 +-- 5 files changed, 47 insertions(+), 114 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index a2a0eeaa5..0b043777d 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -931,6 +931,7 @@ $font-size: rem(15); margin-left: -100%; button { + // top: -35px; position: relative; color: transparent; background-color: transparent; @@ -1036,66 +1037,6 @@ $font-size: rem(15); } - -@media only screen and (min-width: 398px) { - .week-5 { - .calendar-title-container { - font-size: 16px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 323px; - } - } - - .week-6 { - .calendar-title-container { - font-size: 16px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 371px; - } - } - -} - -@media only screen and (min-width: 415px) { - .week-5 { - .calendar-title-container { - font-size: 16px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 319px; - } - } - - .week-6 { - .calendar-title-container { - font-size: 16px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 360px; - } - } - -} - - @media only screen and (min-width: 500px) { .week-5 { .calendar-title-container { diff --git a/src/app/pages/agenda/new-event/new-event.module.ts b/src/app/pages/agenda/new-event/new-event.module.ts index 76e2100d3..2dbd0de42 100644 --- a/src/app/pages/agenda/new-event/new-event.module.ts +++ b/src/app/pages/agenda/new-event/new-event.module.ts @@ -23,6 +23,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatSelectModule } from '@angular/material/select'; import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MatDialogModule } from '@angular/material/dialog'; @NgModule({ imports: [ @@ -30,6 +31,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' FormsModule, IonicModule, NewEventPageRoutingModule, + // MatDatepickerModule, MatInputModule, MatNativeDateModule, @@ -39,7 +41,8 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' NgxMatMomentModule, MatSelectModule, MatButtonModule, - ReactiveFormsModule + ReactiveFormsModule, + MatDialogModule, ], declarations: [NewEventPage] }) diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 7d63fce78..6a5f4e8fe 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -129,11 +129,9 @@ > @@ -162,10 +160,8 @@ > diff --git a/src/global.scss b/src/global.scss index 99cd58892..b04fe890e 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1144,6 +1144,13 @@ background: rgb(92, 92, 92); } + +// angular material inputs + +.mat-form-field-infix, .mat-form-field-wrapper { + padding: 0px !important; +} + .select-calendar { .mat-form-field-infix { width: unset !important; @@ -1465,52 +1472,38 @@ $font-size: rem(15); width: 100%; } // date picker -// ngx-mat-datetime-content .actions { -// z-index: 1; -// position: relative; -// top: -66px; -// margin-bottom: -44px; +ngx-mat-datetime-content .actions { + z-index: 1; + position: relative; + top: -66px; + margin-bottom: -44px; -// button { -// z-index: 11111111; -// } -// } + button { + z-index: 11111111; + } +} -// ngx-mat-datetime-content .ngx-mat-timepicker { -// z-index: 111; -// } -// .mat-form-field-underline { -// display: none !important; -// } +ngx-mat-datetime-content .ngx-mat-timepicker { + z-index: 111; +} +.mat-form-field-underline { + display: none !important; +} -// ngx-mat-datetime-content .mat-input-element { -// padding: 0px !important; -// } +ngx-mat-datetime-content .mat-input-element { + padding: 0px !important; +} +ngx-mat-datetime-content{ + .actions { + .mat-button-disabled { + background-color: #ff5a5a59 !important; + } + } -// ngx-mat-datetime-content{ -// .actions { -// .mat-button-disabled { -// background-color: #ff5a5a59 !important; -// } -// } - -// } - - -// // angular material inputs - -// .mat-form-field-infix, .mat-form-field-wrapper { -// padding: 0px !important; -// } - - -// .mat-form-field-infix input { - -// } - +} pre { font-family: 'Roboto' !important; diff --git a/version/git-version.ts b/version/git-version.ts index d3d65a1be..8f732347a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "403c8c954", - "SHA": "403c8c954371c03710d1dc700cbea0639e3922f9", + "shortSHA": "bf62fc083", + "SHA": "bf62fc083401e82ea99e93f4d309f52c0468860c", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 15 15:19:23 2023 +0100'", + "lastCommitTime": "'Tue Aug 15 15:28:24 2023 +0100'", "lastCommitMessage": "improves", - "lastCommitNumber": "5161", + "lastCommitNumber": "5162", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/new-event/new-event.module.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file