From 1021151efdf5e7d1aef130edc4cfdde5790e36ad Mon Sep 17 00:00:00 2001 From: Jolyon Bloomfield Date: Fri, 3 Apr 2015 17:27:01 -0400 Subject: [PATCH] Complete printing cleanup, rebased into one --- .../lib/xmodule/xmodule/css/capa/display.scss | 11 ++++++++ .../xmodule/xmodule/css/sequence/display.scss | 8 ++++++ lms/static/sass/base/_base.scss | 7 +++++ lms/static/sass/base/_extends.scss | 7 +++++ lms/static/sass/course/_info.scss | 4 +++ lms/static/sass/course/_tabs.scss | 4 +++ .../sass/course/courseware/_courseware.scss | 10 +++++++ .../course/layout/_courseware_header.scss | 2 ++ .../sass/course/modules/_calculator.scss | 2 ++ lms/static/sass/discussion/_discussion.scss | 2 ++ lms/static/sass/shared/_footer.scss | 26 ++++++++++++++++++- lms/static/sass/shared/_header.scss | 2 ++ 12 files changed, 84 insertions(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss index 303a38a5d5..7484768992 100644 --- a/common/lib/xmodule/xmodule/css/capa/display.scss +++ b/common/lib/xmodule/xmodule/css/capa/display.scss @@ -269,6 +269,13 @@ div.problem { } } + // Hides equation previews in symbolic response problems when printing + [id^='display'].equation { + @media print { + display:none; + } + } + span { &.unanswered, &.ui-icon-bullet { display: inline-block; @@ -628,6 +635,10 @@ div.problem { height: ($baseline*2); vertical-align: middle; font-weight: 600; + + @media print { + display: none; + } } .save { diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index 5e597a1fc0..bee65b3bf6 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -40,6 +40,10 @@ $sequence--border-color: #C8C8C8; position: relative; border-bottom: none; + @media print { + display: none; + } + .left-shadow { @extend %ui-depth4; @include linear-gradient(left, $shadow, $transparent); @@ -277,6 +281,10 @@ nav.sequence-bottom { height: 1px; margin: lh(2) auto; text-align: center; + + @media print { + display: none; + } } #seq_content { diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss index 19ed009ce0..e702149cce 100644 --- a/lms/static/sass/base/_base.scss +++ b/lms/static/sass/base/_base.scss @@ -122,6 +122,10 @@ a:focus { margin: 0 auto; background: $content-wrapper-bg; padding-bottom: ($baseline*2); + + @media print { + padding-bottom: 0; + } } .container { @@ -246,6 +250,7 @@ mark { @include transform(rotate(-90deg)); @include transform-origin(0 0); @extend %ui-depth2; + @extend %ui-print-excluded; top: 250px; left: 0; position: fixed; @@ -337,6 +342,8 @@ mark { // UI - skipnav .nav-skip { + @extend %ui-print-excluded; + display: block; position: absolute; left: 0; diff --git a/lms/static/sass/base/_extends.scss b/lms/static/sass/base/_extends.scss index 2ab91d0662..5d48734d8e 100644 --- a/lms/static/sass/base/_extends.scss +++ b/lms/static/sass/base/_extends.scss @@ -128,3 +128,10 @@ white-space: nowrap; text-overflow: ellipsis; } + +// Adds a simple extend that indicates that this user interface element should not print +%ui-print-excluded { + @media print { + display:none; + } +} diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss index 3675396ace..692a6dcabe 100644 --- a/lms/static/sass/course/_info.scss +++ b/lms/static/sass/course/_info.scss @@ -237,4 +237,8 @@ div.info-wrapper { } } } + + @media print { + border: 0; + } } diff --git a/lms/static/sass/course/_tabs.scss b/lms/static/sass/course/_tabs.scss index 360d74738c..d4a659833a 100644 --- a/lms/static/sass/course/_tabs.scss +++ b/lms/static/sass/course/_tabs.scss @@ -9,4 +9,8 @@ div.static_tab_wrapper { section { margin: 0px 0px 20px; } + + @media print { + border: 0; + } } \ No newline at end of file diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index ee341cd5f2..3cd4c97c3d 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -12,6 +12,8 @@ html.video-fullscreen{ } .wrap-instructor-info { + @extend %ui-print-excluded; + margin: ($baseline/2) ($baseline/4) 0 0; overflow: hidden; @@ -246,6 +248,10 @@ div.course-wrapper { padding: 0; } } + + @media print { + padding: 0 2mm; + } } &.closed { @@ -280,6 +286,10 @@ div.course-wrapper { width: flex-grid(11.5) + flex-gutter(); } } + + @media print { + border: 0; + } } .xmodule_VideoModule { diff --git a/lms/static/sass/course/layout/_courseware_header.scss b/lms/static/sass/course/layout/_courseware_header.scss index b544d5d882..658f917fcf 100644 --- a/lms/static/sass/course/layout/_courseware_header.scss +++ b/lms/static/sass/course/layout/_courseware_header.scss @@ -1,6 +1,8 @@ .wrapper-course-material { @include clearfix(); @include box-sizing(border-box); + @extend %ui-print-excluded; + border-bottom: none; margin: 0 auto 0; padding: 0; diff --git a/lms/static/sass/course/modules/_calculator.scss b/lms/static/sass/course/modules/_calculator.scss index 41dde8e17c..23f6d807e9 100644 --- a/lms/static/sass/course/modules/_calculator.scss +++ b/lms/static/sass/course/modules/_calculator.scss @@ -2,6 +2,8 @@ // ==================== div.calc-main { + @extend %ui-print-excluded; + bottom: -126px; left: 0; position: fixed; diff --git a/lms/static/sass/discussion/_discussion.scss b/lms/static/sass/discussion/_discussion.scss index a20ab92a40..e3510a2c26 100644 --- a/lms/static/sass/discussion/_discussion.scss +++ b/lms/static/sass/discussion/_discussion.scss @@ -673,6 +673,8 @@ body.discussion { // inline discussion module and profile thread styling .discussion-module { @extend .discussion-body; + @extend %ui-print-excluded; + position: relative; margin: $baseline 0; padding: $baseline; diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index a797a8a48a..d38397475c 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -289,6 +289,10 @@ $edx-footer-bg-color: rgb(252,252,252); .edx-footer-new { background: $edx-footer-bg-color; + @media print { + @include padding(10px, 10px, 0, 10px); + } + // NOTE: resetting older footer styles - can be removed once not needed box-shadow: none; border-top: none; @@ -300,10 +304,19 @@ $edx-footer-bg-color: rgb(252,252,252); @extend %edx-footer-reset; @extend %edx-footer-section; width: flex-grid(6,12); + + @media print { + @include margin-right(0); + @include padding-right(0); + width: flex-grid(12,12); + border: none; + min-height: 0; + } } .footer-about-title { @extend %edx-footer-title; + @extend %ui-print-excluded; } .footer-about-logo, .footer-about-openedx { @@ -324,14 +337,19 @@ $edx-footer-bg-color: rgb(252,252,252); .footer-about-logo { @include float(left); + @extend %ui-print-excluded; } .footer-about-openedx-logo { @include float(right); + @media print { + @include float(left); + } } .footer-about-copy { @extend %t-copy-sub1; + @extend %ui-print-excluded; margin-bottom: $edx-footer-spacing; color: rgb(61, 62, 63); clear: both; @@ -357,9 +375,14 @@ $edx-footer-bg-color: rgb(252,252,252); display: inline-block; margin-bottom: ($edx-footer-spacing/2); } + + @media print { + margin-bottom: 0; + } } .footer-about-links { + @extend %ui-print-excluded; a { @extend %edx-footer-link; @@ -376,6 +399,7 @@ $edx-footer-bg-color: rgb(252,252,252); .footer-nav { @extend %edx-footer-reset; @extend %edx-footer-section; + @extend %ui-print-excluded; width: flex-grid(3,12); } @@ -397,8 +421,8 @@ $edx-footer-bg-color: rgb(252,252,252); .footer-follow { @extend %edx-footer-reset; @extend %edx-footer-section; + @extend %ui-print-excluded; width: flex-grid(3,12); - } .footer-follow-title { diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index ea72a3582f..91206f59b8 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -117,6 +117,8 @@ header.global { .user { @include float(right); + @extend %ui-print-excluded; + margin-top: ($baseline/4); > .primary {