From 3cb33e6847903b354b3ff574502aea813ed9fd9a Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 16 Feb 2012 12:11:35 -0500 Subject: [PATCH 1/2] Added new print styles --HG-- branch : templates-kf-print --- sass/base/_extends.scss | 12 ++++++++++++ sass/layout/_footer.scss | 4 ++++ sass/layout/_header.scss | 4 ++++ sass/print.scss | 7 +------ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index c482b947e6..75ba814575 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -53,6 +53,10 @@ h1.top-header { padding: lh(); vertical-align: top; width: flex-grid(9) + flex-gutter(); + + @media print { + @include box-shadow(none); + } } .sidebar { @@ -68,6 +72,10 @@ h1.top-header { width: flex-grid(3); position: relative; + @media print { + display: none; + } + h3 { @include box-shadow(0 1px 0 #eee); background: none; @@ -124,6 +132,10 @@ h1.top-header { @include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff); @extend .clearfix; + @media print { + display: none; + } + a { color: darken(#F6EFD4, 80%); diff --git a/sass/layout/_footer.scss b/sass/layout/_footer.scss index 97c28d5fd8..5edcb630b8 100644 --- a/sass/layout/_footer.scss +++ b/sass/layout/_footer.scss @@ -6,6 +6,10 @@ footer { margin-top: $body-line-height; padding: 0 $body-line-height; + @media print { + display: none; + } + p { float: left; diff --git a/sass/layout/_header.scss b/sass/layout/_header.scss index 144194e397..f841bb6049 100644 --- a/sass/layout/_header.scss +++ b/sass/layout/_header.scss @@ -4,6 +4,10 @@ div.header-wrapper { background: $mit-red; border-bottom: 1px solid #fff; + @media print { + display: none; + } + header { @extend .clearfix; @extend .wrapper; diff --git a/sass/print.scss b/sass/print.scss index 12436ba683..8b13789179 100644 --- a/sass/print.scss +++ b/sass/print.scss @@ -1,6 +1 @@ -.header-wrapper {display:none;} -#accordion {display:none;} -.ui-accordion {display:none; -visibility:hidden; -width:0%; -} + From 2fb05da5c42fb5cb3fb1c4f7c63c974c4cd814e6 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 16 Feb 2012 13:59:10 -0500 Subject: [PATCH 2/2] More edits to the print styles --HG-- branch : templates-kf-print --- main.html | 1 - sass/courseware/_courseware.scss | 16 ++++++++++++++++ sass/layout/_layout.scss | 5 +++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/main.html b/main.html index 567f41b1db..2a3f2cca32 100644 --- a/main.html +++ b/main.html @@ -5,7 +5,6 @@ - diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss index 9d7ab8123a..2a54d0cd21 100644 --- a/sass/courseware/_courseware.scss +++ b/sass/courseware/_courseware.scss @@ -50,6 +50,12 @@ div.course-wrapper { width: auto; border-right: 0; } + + @media print { + display: block; + width: auto; + border-right: 0; + } } section.problem { @@ -63,6 +69,16 @@ div.course-wrapper { padding: 0; } + @media print { + display: block; + width: auto; + padding: 0; + + canvas, img { + page-break-inside: avoid; + } + } + span { &.unanswered, &.ui-icon-bullet { @include inline-block(); diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss index c0f52ad268..cc683e3c0a 100644 --- a/sass/layout/_layout.scss +++ b/sass/layout/_layout.scss @@ -17,6 +17,11 @@ html { background: #fff; border-bottom: 1px solid #bbb; + @media print { + border-bottom: 0; + @include border-radius(none); + } + @media screen and (min-width: 1400px) { // @include border-radius(3px); @include box-shadow(0 0 4px #dfdfdf);