From f22389afa2c4637f8175427796d7bf37844e5c09 Mon Sep 17 00:00:00 2001 From: "jvanboxtel@wisc.edu" <jvanboxtel@wisc.edu> Date: Wed, 20 Feb 2019 15:57:27 -0600 Subject: [PATCH] ROENROLL-1329 --- .../course-item/course-item.component.scss | 1 - .../sidenav-menu-item.component.html | 2 +- .../sidenav-menu-item.component.ts | 4 ++ .../term-container.component.scss | 1 - src/assets/material-theme.scss | 2 +- src/assets/sass/general.scss | 1 + src/assets/sass/print.scss | 53 +++++++++++++++++++ 7 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 src/assets/sass/print.scss diff --git a/src/app/degree-planner/shared/course-item/course-item.component.scss b/src/app/degree-planner/shared/course-item/course-item.component.scss index 1dff059..9acedc2 100644 --- a/src/app/degree-planner/shared/course-item/course-item.component.scss +++ b/src/app/degree-planner/shared/course-item/course-item.component.scss @@ -7,7 +7,6 @@ border: solid 1px #fdfdfd; background-color: #fdfdfd; border-radius: 5px; - font-family: 'Helvetica Neue', Georgia, Helvetica, Arial, sans-serif; font-size: 14px; margin-bottom: 8px; box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.1); diff --git a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html index d283b6c..c3afcf0 100644 --- a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html +++ b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html @@ -51,7 +51,7 @@ </mat-panel-title> </mat-expansion-panel-header> <div> - <button mat-button class="sidenav-link-btn"> + <button mat-button class="sidenav-link-btn" (click)="print()"> <i class="material-icons">print</i> Print </button> <button mat-button class="sidenav-link-btn"> diff --git a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.ts b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.ts index bec51a4..4802957 100644 --- a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.ts +++ b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.ts @@ -31,6 +31,10 @@ export class SidenavMenuItemComponent { this.snackBar.open('New academic year has been created'); } + public print() { + window.print(); + } + public onCreatePlanClick() { this.dialog .open(PromptDialogComponent, { diff --git a/src/app/degree-planner/term-container/term-container.component.scss b/src/app/degree-planner/term-container/term-container.component.scss index fe49c67..7a2fd22 100644 --- a/src/app/degree-planner/term-container/term-container.component.scss +++ b/src/app/degree-planner/term-container/term-container.component.scss @@ -79,7 +79,6 @@ border: solid 1.2px #f7c376; background-color: white; border-radius: 5px; - font-family: 'Helvetica Neue', Georgia, Helvetica, Arial, sans-serif; font-size: 14px; margin-bottom: 10px; diff --git a/src/assets/material-theme.scss b/src/assets/material-theme.scss index 496dcc5..a9cb949 100644 --- a/src/assets/material-theme.scss +++ b/src/assets/material-theme.scss @@ -100,7 +100,7 @@ $uw-warn: ( ); $custom-typography: mat-typography-config( - $font-family: '"Helvetica Neue", Georgia, Helvetica, Arial, sans-serif', + $font-family: 'Roboto, "Helvetica Neue", Arial, Helvetica, sans-serif', ); @include mat-core($custom-typography); diff --git a/src/assets/sass/general.scss b/src/assets/sass/general.scss index 593a704..5e9a5c8 100644 --- a/src/assets/sass/general.scss +++ b/src/assets/sass/general.scss @@ -1,4 +1,5 @@ @import 'assets/material-theme.scss'; +@import './print.scss'; body { background-color: #ccc; diff --git a/src/assets/sass/print.scss b/src/assets/sass/print.scss new file mode 100644 index 0000000..3a5bfa3 --- /dev/null +++ b/src/assets/sass/print.scss @@ -0,0 +1,53 @@ +@media print { + * { + overflow: auto !important; + font-size: 12px !important; + -webkit-transition: none !important; + transition: none !important; + } + .mat-expansion-panel-body .term-container-wrapper { + display: flex !important; + } + .mat-expansion-panel-content { + visibility: visible !important; + height: 100% !important; + } + .mat-drawer.mat-sidenav, + .note-item, + .add-new-wrapper, + .mat-button-wrapper, + .course-title, + .mat-icon, + header { + display: none !important; + } + #year-wrapper { + margin: 0px !important; + } + .term-body { + padding: 0 !important; + } + .term-header h2 { + font-weight: bold !important; + } + main { + top: 0 !important; + position: initial !important; + } + .course-number { + font-weight: normal !important; + } + .course-item { + border: none !important; + box-shadow: none !important; + padding: 0 !important; + } + html, + body, + .mat-sidenav-container, + .mat-drawer-content, + mat-sidenav-content { + width: 100%; + height: auto !important; + } +} -- GitLab