diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 8541f9c9e..4b978d797 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -56,7 +56,7 @@
{{event.Location}}
- {{event.Subject}} +

{{event.Subject}}

diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 338bf4ded..1343febc9 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -408,7 +408,7 @@ ion-toolbar{ display: flex; flex-wrap: wrap; align-items: center; - width: 100%; + width: 78%; .location{ font-family: Roboto; font-size: 13px; @@ -417,12 +417,13 @@ ion-toolbar{ } .description{ - width: 275px; + width: 100%; font-family: Roboto; font-size: 15px; font-weight: bold; color: #0d89d1; - + } + .description p{ white-space: nowrap; overflow: hidden !important; text-overflow: ellipsis !important; diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss index 8b6826245..3db96034a 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss @@ -6,8 +6,9 @@ } .content{ padding: 30px 20px 0 20px !important; - margin: 0; + margin: 0 auto; float: left; + overflow: auto; } .header-content{ margin: 0 !important; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 23b750348..66633a13e 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -92,8 +92,7 @@ [showSeconds]="showSeconds" [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" - [touchUi]="touchUi" - [color]="color"> + [touchUi]="touchUi"> @@ -132,8 +131,7 @@ [showSeconds]="showSeconds" [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" - [touchUi]="touchUi" - [color]="color"> + [touchUi]="touchUi"> diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index 80dd5f6e1..6b4c5ee59 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -30,33 +30,38 @@
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }} -
-
- {{task.Senders}} -
-
- {{task.WorkflowName}} +
+ {{ task.Folio }}
+
+
+ {{task.WorkflowName}} +
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }} +
+
+
- {{ task.Folio }} +
+ {{task.Senders}} +
- +
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss index 727b79ead..4e4ca4724 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss @@ -50,14 +50,12 @@ ion-item{ --background: none; } .item { - //border-radius: 15px; - //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); + /* border-radius: 15px; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); */ //Sborder: solid 1px #e9e9e9; background-color: var(--white); margin: 0 auto; - //padding: 10px; - margin-bottom: 10px; - overflow: hidden; + overflow: auto; } .div-content-expediente{ width: 100%; @@ -98,7 +96,6 @@ ion-item{ margin: 0; } .span-left{ - /* border: 1px solid red; */ float: left; font-size: 12px; padding-left: 18px; @@ -113,7 +110,12 @@ ion-item{ /* New CSS */ .expediente{ - padding-top: 10px; + border-radius: 15px; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); + border:1px solid #e9e9e9 !important; + background-color: var(--white); + margin-bottom: 10px !important; + padding: 15px; } .exp-list-item{ //width: 368px; @@ -121,61 +123,85 @@ ion-item{ /* border-bottom: 1px solid gray; */ margin: 10px auto; } -.exp-top-detail{ +.exp-middle-detail, .exp-bottom-detail{ + margin-bottom: 5px; + +} +.exp-middle-detail{ + font-size: 12pt; width: 100%; overflow: auto; -} -.exp-date{ - width: auto; - font-family: Roboto; - font-size: 13px; - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #797979; - float: left; -} -.exp-workflow{ - float: left; - margin-left: 15px; - - .label{ - border-radius: 20px; - background: #ffb703; - font-size: 12px; + .exp-workflow{ + float: left; + margin: 0 !important; + + .label{ + border-radius: 15px; + background: #ffb703; + /* font-size: 12px; */ + float: right; + padding: 2.5px 13.5px 2.5px 13.5px; + color: #fff; + } + } + .exp-date{ + width: auto; + font-family: Roboto; + font-size: 10pt; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #797979; float: right; - padding: 2.5px 13.5px 2.5px 13.5px; - color: #fff; + } } -} -.exp-remetente{ - //width: 200px; - font-family: Roboto; - font-size: 13px; - font-weight: normal; - color: #000000; - float: left; - margin-left: 16px; - -} -.exp-icon{ - width: 45px; - float: right; - font-size: 13px; -} -.exp-icon ion-icon{ - font-size: 25px; - color: #42b9fe; -} -.exp-bottom-detail{ +.exp-top-detail{ + width: 100%; float: left; font-family: Roboto; - font-size: 16px; + font-size: 12pt; font-weight: 700; color: #0d89d1; + + .subject{ + width: 84%; + float: left; + } + + .exp-icon{ + width: fit-content; + float: right; + /* font-size: 13px; */ + margin: 0 !important; + padding: 0 !important; + + ion-icon{ + font-size: 12pt; + color: #42b9fe; + float: left; + } + label{ + font-size: 10pt; + } + } +} +.exp-bottom-detail{ + font-size: 8pt; + width: 100%; + overflow: auto; + + .exp-remetente{ + //width: 200px; + font-family: Roboto; + /* font-size: 13px; */ + font-weight: normal; + color: #000000; + float: left; + /* border: 1px solid red; */ + } } .div-top-header{ width: 400px; diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 7e61bcd30..2ebe8ead3 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -104,8 +104,7 @@ [showSeconds]="showSeconds" [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" - [touchUi]="touchUi" - [color]="color"> + [touchUi]="touchUi"> @@ -133,8 +132,7 @@ [showSeconds]="showSeconds" [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" - [touchUi]="touchUi" - [color]="color"> + [touchUi]="touchUi"> diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index ee94ef140..e587c2e11 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -100,7 +100,7 @@ [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi" - [color]="color"> + > @@ -129,7 +129,7 @@ [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi" - [color]="color"> + > diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 3b8b8d7f7..b1e04b630 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -99,8 +99,7 @@ [showSeconds]="showSeconds" [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" - [touchUi]="touchUi" - [color]="color"> + [touchUi]="touchUi">
@@ -138,8 +137,7 @@ [showSeconds]="showSeconds" [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" - [touchUi]="touchUi" - [color]="color"> + [touchUi]="touchUi">