From efc4afe8212bfb3e3af236ac20801cc926f29e1e Mon Sep 17 00:00:00 2001 From: Sam Ottenhoff Date: Mon, 23 Sep 2024 13:45:05 -0400 Subject: [PATCH 1/5] SAK-50531 Library improve print.css --- library/src/skins/default/src/sass/print.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/library/src/skins/default/src/sass/print.scss b/library/src/skins/default/src/sass/print.scss index e5ca30101596..567929aeae5f 100644 --- a/library/src/skins/default/src/sass/print.scss +++ b/library/src/skins/default/src/sass/print.scss @@ -20,6 +20,12 @@ a[href]:after { #siteStatus, #publishSiteConfirmModal, .pasystem-banner-alerts, +header.portal-header, +sakai-picture-changer, +#select-site-sidebar, +#portal-nav-sidebar, +aside.offcanvas, +.portal-mobilebar, #footer, .#{$namespace}siteHierarchy, .#{$namespace}container--extras, From e8b4248b901870cc7d9c3bd3179566b7536c2e7b Mon Sep 17 00:00:00 2001 From: Sam Ottenhoff Date: Mon, 23 Sep 2024 13:46:25 -0400 Subject: [PATCH 2/5] also add footer --- library/src/skins/default/src/sass/print.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/src/skins/default/src/sass/print.scss b/library/src/skins/default/src/sass/print.scss index 567929aeae5f..7093ad6e564a 100644 --- a/library/src/skins/default/src/sass/print.scss +++ b/library/src/skins/default/src/sass/print.scss @@ -20,7 +20,8 @@ a[href]:after { #siteStatus, #publishSiteConfirmModal, .pasystem-banner-alerts, -header.portal-header, +header, +footer, sakai-picture-changer, #select-site-sidebar, #portal-nav-sidebar, From cc73e5976614aaf1863da8829d527198c76011cc Mon Sep 17 00:00:00 2001 From: Sam Ottenhoff Date: Mon, 23 Sep 2024 13:50:40 -0400 Subject: [PATCH 3/5] also pagenav --- library/src/skins/default/src/sass/print.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/library/src/skins/default/src/sass/print.scss b/library/src/skins/default/src/sass/print.scss index 7093ad6e564a..eaf3a4432f66 100644 --- a/library/src/skins/default/src/sass/print.scss +++ b/library/src/skins/default/src/sass/print.scss @@ -22,6 +22,7 @@ a[href]:after { .pasystem-banner-alerts, header, footer, +nav.sakai-pageNav, sakai-picture-changer, #select-site-sidebar, #portal-nav-sidebar, From a159b07909413b460b8a91aec8a4804d67fbb054 Mon Sep 17 00:00:00 2001 From: Sam Ottenhoff Date: Mon, 23 Sep 2024 14:53:56 -0400 Subject: [PATCH 4/5] move SASS out of tools because tool.css is not loaded in print view --- .../modules/tool/gradebook/_gradebook.scss | 28 ------ .../tool/lessonbuilder/_lessonbuilder.scss | 61 ------------ .../sass/modules/tool/syllabus/_syllabus.scss | 6 -- library/src/skins/default/src/sass/print.scss | 99 +++++++++++++++++++ 4 files changed, 99 insertions(+), 95 deletions(-) diff --git a/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss b/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss index 794a6b741d0b..3dfbd58e81cf 100644 --- a/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss +++ b/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss @@ -1284,34 +1284,6 @@ padding-bottom: 20px; border-bottom: 1px solid var(--sakai-border-color); } - /* **************************************************************** * - * Gradebook Print styles * - * **************************************************************** */ - - @media print { - - .gb-summary-expand-all, - .gb-summary-collapse-all, - .gb-summary-category-toggle, - #toggleCategories, - #gradeSummaryTable-sticky .tablesorter-icon { - display: none; - } - - .gb-summary-grade-panel { - height: auto !important; - } - - #gradeSummaryTable { - page-break-inside: auto; - } - - #gradeSummaryTable tr { - page-break-inside: avoid; - page-break-after:auto; - } - -} /* ********************************************************************* * * Gradebook Settings styles * diff --git a/library/src/skins/default/src/sass/modules/tool/lessonbuilder/_lessonbuilder.scss b/library/src/skins/default/src/sass/modules/tool/lessonbuilder/_lessonbuilder.scss index c09bceb5f966..7860016cb65e 100644 --- a/library/src/skins/default/src/sass/modules/tool/lessonbuilder/_lessonbuilder.scss +++ b/library/src/skins/default/src/sass/modules/tool/lessonbuilder/_lessonbuilder.scss @@ -2277,67 +2277,6 @@ /* end lessons in iframe */ /* narrow screen */ - /* print */ - @media print { - - .oldPortal .portletTitle { - padding-top: 30px !important - } - - .cols9 { - width: calc(100% / 9 - 32px) !important; - } - [class~="cols9"][class~="double"] { - width: calc(200% / 9 - 32px) !important; - } - .cols8 { - width: calc(100% / 8 - 32px) !important; - } - [class~="cols8"][class~="double"] { - width: calc(200% / 8 - 32px) !important; - } - .cols7 { - width: calc(100% / 7 - 32px) !important; - } - [class~="cols7"][class~="double"] { - width: calc(200% / 7 - 32px) !important; - } - .cols6 { - width: calc(100% / 6 - 32px) !important; - } - [class~="cols6"][class~="double"] { - width: calc(200% / 6 - 32px) !important; - } - .cols5 { - width: calc(100% / 5 - 32px) !important; - } - [class~="cols5"][class~="double"] { - width: calc(200% / 5 - 32px) !important; - } - .cols4 { - width: calc(100% / 4 - 32px) !important; - } - [class~="cols4"][class~="double"] { - width: calc(200% / 4 - 32px) !important; - } - .cols3 { - width: calc(100% / 3 - 32px) !important; - } - [class~="cols3"][class~="double"] { - width: calc(200% / 3 - 32px) !important; - } - .cols2 { - width: calc(100% / 2 - 32px) !important; - } - [class~="cols2"][class~="double"] { - width: calc(200% / 2 - 32px) !important; - } - .cols1 { - width: calc(100% - 32px) !important; - } - } - /* end media print */ - /* high z-index for items in morpheus. We use large z-index to make sure we go on top of any video players or other embedded content. That requires larger values for some elements of Morpheus. */ diff --git a/library/src/skins/default/src/sass/modules/tool/syllabus/_syllabus.scss b/library/src/skins/default/src/sass/modules/tool/syllabus/_syllabus.scss index 985e5a795df0..c996419b538a 100644 --- a/library/src/skins/default/src/sass/modules/tool/syllabus/_syllabus.scss +++ b/library/src/skins/default/src/sass/modules/tool/syllabus/_syllabus.scss @@ -1,11 +1,5 @@ .#{$namespace}sakai-syllabus { - @media print { - .noprint { - display: none; - } - } - .editItem:hover { padding-right: 18px; diff --git a/library/src/skins/default/src/sass/print.scss b/library/src/skins/default/src/sass/print.scss index eaf3a4432f66..e85af85db318 100644 --- a/library/src/skins/default/src/sass/print.scss +++ b/library/src/skins/default/src/sass/print.scss @@ -22,6 +22,7 @@ a[href]:after { .pasystem-banner-alerts, header, footer, +.jump-to-top, nav.sakai-pageNav, sakai-picture-changer, #select-site-sidebar, @@ -58,3 +59,101 @@ aside.offcanvas, height: 32px; } +.#{$namespace}sakai-lessonbuildertool { + ul#toolbar, + .lb-offscreen, + .modal-dialog, + a.ui-button, + .showPollGraph { + display: none !important; + } + + .oldPortal .portletTitle { + padding-top: 30px !important + } + + .cols9 { + width: calc(100% / 9 - 32px) !important; + } + [class~="cols9"][class~="double"] { + width: calc(200% / 9 - 32px) !important; + } + .cols8 { + width: calc(100% / 8 - 32px) !important; + } + [class~="cols8"][class~="double"] { + width: calc(200% / 8 - 32px) !important; + } + .cols7 { + width: calc(100% / 7 - 32px) !important; + } + [class~="cols7"][class~="double"] { + width: calc(200% / 7 - 32px) !important; + } + .cols6 { + width: calc(100% / 6 - 32px) !important; + } + [class~="cols6"][class~="double"] { + width: calc(200% / 6 - 32px) !important; + } + .cols5 { + width: calc(100% / 5 - 32px) !important; + } + [class~="cols5"][class~="double"] { + width: calc(200% / 5 - 32px) !important; + } + .cols4 { + width: calc(100% / 4 - 32px) !important; + } + [class~="cols4"][class~="double"] { + width: calc(200% / 4 - 32px) !important; + } + .cols3 { + width: calc(100% / 3 - 32px) !important; + } + [class~="cols3"][class~="double"] { + width: calc(200% / 3 - 32px) !important; + } + .cols2 { + width: calc(100% / 2 - 32px) !important; + } + [class~="cols2"][class~="double"] { + width: calc(200% / 2 - 32px) !important; + } + .cols1 { + width: calc(100% - 32px) !important; + } +} + +.#{$namespace}sakai-syllabus { + .noprint { + display: none; + } +} + +.#{$namespace}sakai-gradebookng { + .gb-summary-expand-all, + .gb-summary-collapse-all, + .gb-summary-category-toggle, + #toggleCategories, + #gradebook-navbar, + a.dropdown-item, + .gradesToolbar1, + #gradeSummaryTable-sticky .tablesorter-icon { + display: none !important; + } + + .gb-summary-grade-panel { + height: auto !important; + } + + #gradeSummaryTable { + page-break-inside: auto; + } + + #gradeSummaryTable tr { + page-break-inside: avoid; + page-break-after:auto; + } + +} From 3e65a65dcd48f2236eed8a0eb7908c64d284d0a1 Mon Sep 17 00:00:00 2001 From: Sam Ottenhoff Date: Mon, 23 Sep 2024 14:54:51 -0400 Subject: [PATCH 5/5] actionToolBar --- library/src/skins/default/src/sass/print.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/library/src/skins/default/src/sass/print.scss b/library/src/skins/default/src/sass/print.scss index e85af85db318..0e5e04084488 100644 --- a/library/src/skins/default/src/sass/print.scss +++ b/library/src/skins/default/src/sass/print.scss @@ -24,6 +24,7 @@ header, footer, .jump-to-top, nav.sakai-pageNav, +.actionToolBar, sakai-picture-changer, #select-site-sidebar, #portal-nav-sidebar,