diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f721322e2..21fd97ea0 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -13,7 +13,7 @@ import { HttpClientModule } from '@angular/common/http'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { File } from '@ionic-native/File/ngx'; +//import { File } from '@ionic-native/File/ngx'; import { WebView } from '@ionic-native/ionic-webview/ngx'; import { FilePath } from '@ionic-native/file-path/ngx'; import { Camera } from '@ionic-native/camera/ngx'; @@ -35,7 +35,7 @@ import { IonicStorageModule } from '@ionic/storage'; { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, InAppBrowser, Camera, - File, + //File, WebView, FilePath, ], diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index d08ad6d08..51c35d4f1 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -8,7 +8,7 @@ import { HomePageRoutingModule } from './home-routing.module'; import { HomePage } from './home.page'; /* import { IonicSelectableModule } from 'ionic-selectable'; */ - +import { SharedModule } from 'src/app/shared/shared.module'; @NgModule({ imports: [ @@ -16,6 +16,7 @@ import { HomePage } from './home.page'; FormsModule, IonicModule, HomePageRoutingModule, + SharedModule ], declarations: [HomePage] }) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 87a2e1782..66edc9c60 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -1,5 +1,7 @@ - - + + + + @@ -22,11 +24,16 @@ Acções - + - Presidente da República - - - - - - - - - - - Combinada - - - Oficial - - - Pessoal - - - + - + + -

{{customDate}}

+

{{customDate}}

+ + +

{{totalEvent}} eventos agendados para hoje

 - - - -
- - - - - - - -
- - -
-
-

{{event.StartDate | date: 'hh:mm'}}

-

{{event.EndDate | date: 'hh:mm'}}

-
-
-

{{event.Location}}

-

{{event.Subject}}

-
-
- - -
- - - - -
- - -
-
-

{{event.StartDate | date: 'hh:mm'}}

-

{{event.EndDate | date: 'hh:mm'}}

-
-
-

{{event.Location}}

-

{{event.Subject}}

-
-
- - -
- - - - -
- - -
-
-

{{event.StartDate | date: 'hh:mm'}}

-

{{event.EndDate | date: 'hh:mm'}}

-
-
-

{{event.Location}}

-

{{event.Subject}}

-
-
- - -
- -
- +
+
{{hoursMinutes}}
+
"{{currentEvent}}"
+
+ +
+
+
+
+ +
A sua Agenda
+
+ + +
+
+
    +
  • +
    +
    +
    {{event.StartDate | date: 'hh:mm'}}
    +
    {{event.EndDate | date: 'hh:mm'}}
    +
    +
    +
    {{event.Location}}
    +
    {{event.Subject}}
    +
    +
    +
    • + +
+ +
+
+ +
+
+
+ +
Correspondência por ler
+
+ + +
+
+
    +
  • +
    +
    +
    {{task.CreateDate | date: 'd/M/yy'}}
    +
    {{task.CreateDate | date: 'hh:mm'}}
    +
    +
    +
    {{ task.Remetente }}
    +
    {{ task.Folio }}
    +
    +
    +
    • + +
+
+
+
+ + + + \ No newline at end of file diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index cae4ec29a..5df488337 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + /* HEADER */ .bg-blue{ --background:#0782c9; @@ -266,4 +268,215 @@ ion-toolbar{ bottom: 15px; right: 14px; color: #e16817; - } \ No newline at end of file + } + + + +// new +.main{ + padding: 0px em(20px); +} + +.event-number{ + color: white; + font-family: Roboto; + font-size: 15px; + color: var(--white); + + bold{ + font-family: Roboto; + font-size: 25px; + text-align: right; + color: var(--white); + } +} +.time{ + font-family: Roboto; + font-size: 30px; + text-align: center; + color: var(--white); + line-height: unset; +} + +.next-meeting{ + display: flex; + justify-content: center; + margin: 0px 20px; + margin-top: 15px; + + .meeting-time { + font-size: em(25px); + font-family: Roboto; + font-weight: 300; + color: var(--white); + margin-right: 7px; + } + + .meeting-description { + margin-top: 2px; + font-family: Roboto; + font-size: 15px; + color: var(--white); + } +} + +.conteiner-box { + display: flex; + flex-wrap: wrap; + justify-content: center; +} +.schedule { + max-width: 400px; + font-family: Roboto; + margin: 10px 0px; + padding: 20px; + background-color: white; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); + border: solid 1px #e9e9e9; + margin-bottom: 20px; + border-radius: 25px; + .schedule-header{ + display: flex; + margin-bottom: 20px; + justify-content: space-between; + .title { + display: flex; + align-items: center; + .icon{ + color: #e8e8e8; + height: 35px; + width: 35px; + margin-right: 10px; + } + .text{ + font-family: Roboto; + font-size: 20px; + color: black; + } + } + .icon-next { + color: #e8e8e8; + height: 35px; + width: 35px; + font-size: 35px; + font-size: 35px; + } + } + .content{ + ul{ + padding: 0px; + margin: 0px; + .d-flex{ + width: 100%; + height: 40px; + display: flex; + justify-content: space-between; + align-items: center; + } + li{ + padding-bottom: 5px; + margin-top: 5px; + border-bottom: 1px solid #ebebeb; + display: flex; + justify-content: space-between; + align-items: center; + .schedule-time{ + margin-right: 10px; + .time-start{ + color: #797979 !important; + font-family: Roboto; + font-size: 13px; + } + .time-end{ + color: #797979 !important; + font-family: Roboto; + font-size: 13px; + } + } + .schedule-date{ + width: 22%; + color: #797979 !important; + font-size: 13px; + } + .schedule-details{ + display: flex; + flex-wrap: wrap; + align-items: center; + width: 100%; + .location{ + font-family: Roboto; + font-size: 13px; + color: black; + width: 100%; + + } + .description{ + font-family: Roboto; + font-size: 15px; + font-weight: bold; + color: #0d89d1; + } + } + .color{ + width: 5px; + height: 40px; + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; + background-color: #f05d5e; + } + } + li:last-child{ + border-bottom: unset !important; + padding-bottom: unset !important; + } + } + + } + + .resume{ + .title{ + font-family: Roboto; + font-size: 15px; + font-weight: 500; + color: #797979; + margin-bottom: 5px; + margin-top: 10px; + } + .event-num, .first-event-time{ + font-family: Roboto; + font-size: 15px; + display: block; + color: black; + } + } + +} + +.d-flex { + display: flex; +} + +.pointer{ + cursor: pointer; +} + +@media only screen and (min-width: 804px) { + + .schedule:first-child { + margin-right: 2%; + + } +} + +@media only screen and (min-width: 478px) { + .schedule{ + width: 400px; + } +} + + +@media only screen and (max-width: 478px) { + .schedule{ + width: 360px; + } +} \ No newline at end of file diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 70921673c..002c690a9 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -12,6 +12,8 @@ import { AuthConnstants } from 'src/app/config/auth-constants'; import { ModalController } from '@ionic/angular'; import { EventDetailPage } from './event-detail/event-detail.page'; import { EventDetailModalPage } from './event-detail-modal/event-detail-modal.page'; +import { ProcessesService } from '../../services/processes.service'; +import { DailyWorkTask } from '../../models/dailyworktask.model'; @Component({ selector: 'app-events', @@ -35,6 +37,7 @@ export class EventsPage implements OnInit { /* Set segment variable */ segment:string; public profile:string; + currentEvent: any; eventsList: Event[]; officialeventsList: Event[]; @@ -46,8 +49,12 @@ export class EventsPage implements OnInit { combinedEvents: Event[]; customText = false; + totalEvent=0; + currentHoursMinutes: String; showLoader: boolean; + + taskslist:DailyWorkTask[]; constructor(private eventService: EventsService, private router: Router, @@ -55,8 +62,18 @@ export class EventsPage implements OnInit { public activatedRoute: ActivatedRoute, private alertController: AlertService, private modalController: ModalController, - private authService: AuthService) { + private authService: AuthService, + private processes:ProcessesService) { this.prEventList = null; + + // update hours and minutes + setInterval(()=> { + this.currentHoursMinutes = formatDate(new Date(), 'HH:MM', 'pt'); + }, 1000); + + // list + this.LoadList(); + } ngOnInit() { @@ -65,7 +82,22 @@ export class EventsPage implements OnInit { //Initialize profile as mdgpr this.profile = "mdgpr"; console.log(this.profile); - + + // set event list + /* if(this.profile == "mdgpr"){ + this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventsList = res; + console.log(this.eventsList); + this.totalEvent = this.eventsList.length; + }); + } + else{ + this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventsList = res; + this.totalEvent = this.eventsList.length; + }); + + } */ this.showGreeting(); @@ -97,14 +129,18 @@ export class EventsPage implements OnInit { { case "Combinada": if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt') /* + ' 00:00:00' */, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; + this.currentEvent = res[0].Subject; + this.totalEvent = this.eventsList.length; this.showLoader = false; }); }else{ this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; console.log(this.eventsList); + this.currentEvent = res[0].Subject; + this.totalEvent = this.eventsList.length; this.showLoader = false; }); } @@ -201,5 +237,32 @@ export class EventsPage implements OnInit { return await modal.present(); } + + /** + * @returns time in format HH:MM + */ + get hoursMinutes():String { + + return this.currentHoursMinutes; + + } + + LoadList() + { + this.processes.GetTasksList("Expediente", false).subscribe(result => { + this.taskslist = new Array(); + result.forEach(element => { + let task: DailyWorkTask = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceFolio, + "Senders": element.originator.email, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.formURL, + "Remetente": element.workflowInstanceDataFields.Remetente + } + this.taskslist.push(task); + }); + }); + } } diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 5742ae085..c47ea5e6c 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -1,15 +1,147 @@ - - - Pesquisa - + + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+ +
- - -
- - + + + +
+
+
+
+

Relatório

+ 10 +
+
+

Relatório

+ 10 +
+
+

Relatório

+ 10 +
+
+

Relatório

+ 10 +
+
+

Relatório

+ 10 +
+
+

Relatório

+ 10 +
+
+
+ +
+
+
- - + +
+ +
+

Palavas mais pesquisdas

+
+ + +
+
+
+
+

Order por:Mais Recente

+
+
+ +
+
+
+
    +
  • +
    + +
    +
    +

    title

    +
    + MINEC, MINFIN + 13/04/2020 +
    +
    +
    • +
  • +
    + +
    +
    +

    title

    +
    + MINEC, MINFIN + 13/04/2020 +
    +
    +
    • +
  • +
    + +
    +
    +

    title

    +
    + MINEC, MINFIN + 13/04/2020 +
    +
    +
    • +
  • +
    + +
    +
    +

    title

    +
    + MINEC, MINFIN + 13/04/2020 +
    +
    +
    • +
  • +
    + +
    +
    +

    title

    +
    + MINEC, MINFIN + 13/04/2020 +
    +
    +
    • +
+
+ +
+ diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index e2c1ca1a4..df087037b 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -1,18 +1,210 @@ -.div-search{ - width: 94%; - margin: 3%; - border: 0.5px solid #333; - padding: 0 5px 0 5px; - overflow: auto; +.header-main{ + padding: 5px 18px; + padding-bottom: 2px; + padding-top: 25px; + .search-input-container{ + max-width: 309px; + background-color: white; + border-radius: 27.5px; + border: solid 1px #ebebeb; + .icon{ + color: #797979; + width: 45px; + height: 45px; + display: flex; + justify-content: center; + font-size: 25px; + align-items: center; + } + .icon-z{ + width: 15px; + } + } + .icon-z{ + display: flex; + justify-content: center; + align-items: center; + font-size: 45px; + } + .profile{ + display: none; + font-size: 45px; + } + +} +// search result type +.options{ + margin-top: 10px; + .container{ + display: flex; + .d-flex{ + display: flex; + flex-wrap: wrap; + width: 100%; + flex-wrap: wrap; + .button{ + width: 116px; + border: solid 1px #e9e9e9; + margin: 0px 5px; + margin-bottom: 10px; + padding: 5px 20px; + p{ + padding: 0px; + margin: 0px; + font-family: Roboto; + color: #0d89d1; + font-size: 15px; + } + .label{ + font-family: Roboto; + font-size: 13px; + font-weight: 300; + color: #797979; + } + border-radius: 15px; + } + + .button:hover{ + background-color: #42b9fe; + color: white; + p{ + color: white; + } + .label{ + color: white; + } + } + } + .icon{ + display: none; + width: 45px; + height: 45px; + justify-content: center; + align-items: center; + ion-icon{ + width: 25px; + } + } + } + + } -.search-input{ - width: 90%; - float: left; + + + +.d-flex{ + display: flex; + // search result + .search-result{ + width: 100%; + border-bottom: unset; + padding: 0px 20px; + + .header{ + border-top: 1px solid #ebebeb; + .sort-by{ + width: 100%; + .order{ + font-family: Roboto; + font-size: 13px; + font-weight: 300; + color:#797979 + } + .order-labal{ + font-family: Roboto; + font-size: 15px; + color: #0d89d1; + margin-left: 20px; + } + } + ion-icon{ + font-size: 25px; + } + } + ul{ + padding: 0px; + margin: 0px; + li{ + padding-top: 8px; + padding-bottom: 8px; + border-top: 1px solid #ebebeb; + display: flex; + align-items: center; + .icon{ + font-size: 35px; + align-items: center; + display: flex; + } + .content{ + width: 100%; + margin-left: 10px; + p{ + margin: 0px; + width: 100%; + font-family: Roboto; + font-size: 15px; + color: #0d89d1; + line-height: 1.67; + } + span{ + height: 15px; + font-family: Roboto; + font-size: 13px; + font-weight: 300; + color: #797979; + } + } + } + } + } + // most searched word + .most-searched-words{ + width: 400px; + display: none; + p{ + height: 24px; + font-family: Roboto; + font-size: 20px; + text-align: center; + color: black; + } + } +} + + + + +@media only screen and (min-width: 1024px) { + + .header-main { + background-color: #0782c9; + .profile{ + display: inline-block; + } + .icon-most-searched-word-open{ + display: none !important; + } + } + + .options{ + .container{ + border-bottom: 1px solid #ebebeb; + .icon{ + display: flex; + } + } + padding: 0px 20px; + } + + + .most-searched-words{ + display: inline-block !important; + } + .search-result{ + border-left: 1px solid #d8d8d8; + .header{ + border-top: unset !important; + } + } } -.icon-search{ - width: 8%; - padding: 8px 3px 5px 2px; - font-size: 25px; - float: right; -} \ No newline at end of file diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 65200fe39..a20587ad8 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; @Component({ selector: 'app-search', @@ -7,9 +8,12 @@ import { Component, OnInit } from '@angular/core'; }) export class SearchPage implements OnInit { - constructor() { } + constructor(private modalController: ModalController) { } ngOnInit() { } + close(){ + this.modalController.dismiss(); + } } diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 49c3e1cac..bb8995fb1 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -1,14 +1,26 @@ -
-
- -
- -
- -
-
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + + - + \ No newline at end of file diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss index cf8935c63..d18475831 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -1,28 +1,32 @@ -.div-top-header{ - width: 400px; - margin: 0 auto; - background-color: #0782c9; - overflow: auto; - padding-top: 15px; - border: 0!important; +@import '~src/function.scss'; - .div-search{ - font-size: 45px; - float: left; - margin: 0 0 0 10px - } - .div-logo{ - background: transparent; - width: 140px; - margin: 5px 0 0px 71px; - float: left; - } - .div-logo img{ - width: 100%; - } - .div-profile{ - font-size: 45px; - float: right; - margin-right: 10px; - } - } \ No newline at end of file +.div-top-header{ + margin: 0 auto; + background-color: #0782c9; + overflow: auto; + padding-top: em(15px); + border: 0!important; + + .div-search{ + font-size: 45px; + margin: 0 0 0 10px + } + .div-logo{ + background: transparent; + width: em(140px); + margin: 0px auto; + margin-top: 5px; + justify-content: center; + display: flex; + } + .div-logo img{ + width: 100%; + margin: 0px auto; + } + .div-profile{ + font-size: 45px; + margin-right: 10px; + justify-content: flex-end; + display: flex; + } +} \ No newline at end of file diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index f0f551bca..a983f75e9 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; +import { SearchPage } from 'src/app/pages/search/search.page'; @Component({ selector: 'app-header', @@ -7,9 +9,21 @@ import { Component, OnInit } from '@angular/core'; }) export class HeaderPage implements OnInit { - constructor() { } + constructor(private modalController: ModalController) { } ngOnInit() { } + async openSearch() { + const modal = await this.modalController.create({ + component: SearchPage, + cssClass: 'search', + componentProps: { + } + }); + return await modal.present(); + } + + + } diff --git a/src/assets/images/icons-arrow-arrow-down-25.svg b/src/assets/images/icons-arrow-arrow-down-25.svg new file mode 100644 index 000000000..9601cfc73 --- /dev/null +++ b/src/assets/images/icons-arrow-arrow-down-25.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/assets/images/icons-arrow-circle-arrow-right.svg b/src/assets/images/icons-arrow-circle-arrow-right.svg new file mode 100644 index 000000000..9d054aedf --- /dev/null +++ b/src/assets/images/icons-arrow-circle-arrow-right.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/images/icons-correspondencias.svg b/src/assets/images/icons-correspondencias.svg new file mode 100644 index 000000000..306a41a35 --- /dev/null +++ b/src/assets/images/icons-correspondencias.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-default-agenda.svg b/src/assets/images/icons-default-agenda.svg new file mode 100644 index 000000000..0ffb2f94b --- /dev/null +++ b/src/assets/images/icons-default-agenda.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-most-searched-words-open.svg b/src/assets/images/icons-most-searched-words-open.svg new file mode 100644 index 000000000..cd0fa9c46 --- /dev/null +++ b/src/assets/images/icons-most-searched-words-open.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-nav-agenda-bag.svg b/src/assets/images/icons-nav-agenda-bag.svg new file mode 100644 index 000000000..6edb5708b --- /dev/null +++ b/src/assets/images/icons-nav-agenda-bag.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-search-close.svg b/src/assets/images/icons-search-close.svg new file mode 100644 index 000000000..11669d50a --- /dev/null +++ b/src/assets/images/icons-search-close.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-search-document.svg b/src/assets/images/icons-search-document.svg new file mode 100644 index 000000000..50e282eb5 --- /dev/null +++ b/src/assets/images/icons-search-document.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/function.scss b/src/function.scss new file mode 100644 index 000000000..818b0bb66 --- /dev/null +++ b/src/function.scss @@ -0,0 +1,60 @@ + +// =============== Custom function ============================== + +// convert string number to int or double +@function to-number($value) { + @if type-of($value) == 'number' { + @return $value; + } @else if type-of($value) != 'string' { + @error 'Value for `to-number` should be a number or a string.'; + } + + $result: 0; + $digits: 0; + $minus: str-slice($value, 1, 1) == '-'; + $numbers: ('0': 0, '1': 1, '2': 2, '3': 3, '4': 4, '5': 5, '6': 6, '7': 7, '8': 8, '9': 9); + + @for $i from if($minus, 2, 1) through str-length($value) { + $character: str-slice($value, $i, $i); + + @if (index(map-keys($numbers), $character) or $character == '.') { + @if $character == '.' { + $digits: 1; + } @else if $digits == 0 { + $result: $result * 10 + map-get($numbers, $character); + } @else { + $digits: $digits * 10; + $result: $result + map-get($numbers, $character) / $digits; + } + } + } + + @return if($minus, -$result, $result);; + } + + // convert px to rem + @function rem($size) { + $remSize: to-number($size) / 16; + //Default font size on html is 16px; + @return #{$remSize}rem; + } + + // convert px to em + @function em($size) { + $remSize: to-number($size) / 16px; + @return #{$remSize}em; + } + + // convert pt to rem + @function pt-rem($size) { + $pxSize: to-number($size) * 1.328147; + $remSize: $pxSize / 16; + @return #{$remSize}rem; + } + + // convert pt to em + @function pt-em($size) { + $pxSize: to-number($size) * 1.328147; + $remSize: $pxSize / 16; + @return #{$remSize}em; + } \ No newline at end of file