Commit 27d04ade by Jolyon Bloomfield

A variety of small printing fixes

parent d61d193d
// capa - styling // capa - styling
// ==================== // ====================
// Table of Contents // Table of Contents
// * +Variables - Capa // * +Variables - Capa
// * +Extends - Capa // * +Extends - Capa
// * +Mixins - Status Icon - Capa // * +Mixins - Status Icon - Capa
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
// * +Problem - Image Input Overrides // * +Problem - Image Input Overrides
// +Variables - Capa // +Variables - Capa
// ==================== // ====================
$annotation-yellow: rgba(255,255,10,0.3); $annotation-yellow: rgba(255,255,10,0.3);
$color-copy-tip: rgb(100,100,100); $color-copy-tip: rgb(100,100,100);
$correct: $green-d1; $correct: $green-d1;
$incorrect: $red; $incorrect: $red;
// +Extends - Capa // +Extends - Capa
// ==================== // ====================
// Duplicated from _mixins.scss due to xmodule compilation, inheritance issues // Duplicated from _mixins.scss due to xmodule compilation, inheritance issues
%use-font-awesome { %use-font-awesome {
font-family: FontAwesome; font-family: FontAwesome;
...@@ -36,9 +36,9 @@ $incorrect: $red; ...@@ -36,9 +36,9 @@ $incorrect: $red;
} }
// +Mixins - Status Icon - Capa // +Mixins - Status Icon - Capa
// ==================== // ====================
@mixin status-icon($color: $gray, $fontAwesomeIcon: "\f00d"){ @mixin status-icon($color: $gray, $fontAwesomeIcon: "\f00d"){
&:after { &:after {
@extend %use-font-awesome; @extend %use-font-awesome;
@include margin-left(17px); @include margin-left(17px);
...@@ -49,7 +49,7 @@ $incorrect: $red; ...@@ -49,7 +49,7 @@ $incorrect: $red;
} }
// +Resets - Deprecate Please // +Resets - Deprecate Please
// ==================== // ====================
h2 { h2 {
margin-top: 0; margin-top: 0;
margin-bottom: ($baseline*0.75); margin-bottom: ($baseline*0.75);
...@@ -123,7 +123,7 @@ div.problem-progress { ...@@ -123,7 +123,7 @@ div.problem-progress {
} }
// +Problem - Base // +Problem - Base
// ==================== // ====================
div.problem { div.problem {
@media print { @media print {
display: block; display: block;
...@@ -141,7 +141,7 @@ div.problem { ...@@ -141,7 +141,7 @@ div.problem {
} }
// +Problem - Choice Group // +Problem - Choice Group
// ==================== // ====================
div.problem { div.problem {
.choicegroup { .choicegroup {
@include clearfix(); @include clearfix();
...@@ -163,7 +163,7 @@ div.problem { ...@@ -163,7 +163,7 @@ div.problem {
@include status-icon($correct, "\f00c"); @include status-icon($correct, "\f00c");
border: 2px solid $correct; border: 2px solid $correct;
// keep green for correct answers on hover. // keep green for correct answers on hover.
&:hover { &:hover {
border-color: $correct; border-color: $correct;
} }
...@@ -173,7 +173,7 @@ div.problem { ...@@ -173,7 +173,7 @@ div.problem {
@include status-icon($incorrect, "\f00d"); @include status-icon($incorrect, "\f00d");
border: 2px solid $incorrect; border: 2px solid $incorrect;
// keep red for incorrect answers on hover. // keep red for incorrect answers on hover.
&:hover { &:hover {
border-color: $incorrect; border-color: $incorrect;
} }
...@@ -206,10 +206,10 @@ div.problem { ...@@ -206,10 +206,10 @@ div.problem {
} }
} }
// +Problem - Status Indicators // +Problem - Status Indicators
// ==================== // ====================
// Summary status indicators shown after the input area // Summary status indicators shown after the input area
div.problem { div.problem {
.indicator-container { .indicator-container {
...@@ -240,8 +240,8 @@ div.problem { ...@@ -240,8 +240,8 @@ div.problem {
} }
// +Problem - Misc, Unclassified Mess // +Problem - Misc, Unclassified Mess
// ==================== // ====================
div.problem { div.problem {
ol.enumerate { ol.enumerate {
li { li {
&:before { &:before {
...@@ -422,12 +422,12 @@ div.problem { ...@@ -422,12 +422,12 @@ div.problem {
background: #f1f1f1; background: #f1f1f1;
} }
} }
} }
// Hides equation previews in symbolic response problems when printing // Hides equation previews in symbolic response problems when printing
[id^='display'].equation { [id^='display'].equation {
@media print { @media print {
display:none; display: none;
} }
} }
...@@ -699,10 +699,10 @@ div.problem { ...@@ -699,10 +699,10 @@ div.problem {
} }
// +Problem - Text Input, Numerical Input // +Problem - Text Input, Numerical Input
// ==================== // ====================
.problem { .problem {
.capa_inputtype.textline, .inputtype.formulaequationinput { .capa_inputtype.textline, .inputtype.formulaequationinput {
input { input {
@include box-sizing(border-box); @include box-sizing(border-box);
border: 2px solid $gray-l4; border: 2px solid $gray-l4;
...@@ -723,7 +723,7 @@ div.problem { ...@@ -723,7 +723,7 @@ div.problem {
// CASE: incorrect answer // CASE: incorrect answer
> .incorrect { > .incorrect {
input { input {
border: 2px solid $incorrect; border: 2px solid $incorrect;
} }
...@@ -734,8 +734,8 @@ div.problem { ...@@ -734,8 +734,8 @@ div.problem {
// CASE: correct answer // CASE: correct answer
> .correct { > .correct {
input { input {
border: 2px solid $correct; border: 2px solid $correct;
} }
...@@ -747,7 +747,7 @@ div.problem { ...@@ -747,7 +747,7 @@ div.problem {
// CASE: unanswered // CASE: unanswered
> .unanswered { > .unanswered {
input { input {
border: 2px solid $gray-l4; border: 2px solid $gray-l4;
} }
...@@ -760,7 +760,7 @@ div.problem { ...@@ -760,7 +760,7 @@ div.problem {
// +Problem - Option Input (Dropdown) // +Problem - Option Input (Dropdown)
// ==================== // ====================
.problem { .problem {
.inputtype.option-input { .inputtype.option-input {
margin: (-$baseline/2) 0 $baseline; margin: (-$baseline/2) 0 $baseline;
...@@ -781,8 +781,8 @@ div.problem { ...@@ -781,8 +781,8 @@ div.problem {
} }
// +Problem - CodeMirror // +Problem - CodeMirror
// ==================== // ====================
div.problem { div.problem {
.CodeMirror { .CodeMirror {
border: 1px solid black; border: 1px solid black;
...@@ -836,7 +836,7 @@ div.problem { ...@@ -836,7 +836,7 @@ div.problem {
} }
// +Problem - Actions // +Problem - Actions
// ==================== // ====================
div.problem .action { div.problem .action {
margin-top: $baseline; margin-top: $baseline;
...@@ -847,6 +847,9 @@ div.problem .action { ...@@ -847,6 +847,9 @@ div.problem .action {
vertical-align: middle; vertical-align: middle;
text-transform: uppercase; text-transform: uppercase;
font-weight: 600; font-weight: 600;
@media print {
display: none;
}
} }
.save { .save {
...@@ -877,8 +880,8 @@ div.problem .action { ...@@ -877,8 +880,8 @@ div.problem .action {
} }
// +Problem - Misc, Unclassified Mess Part 2 // +Problem - Misc, Unclassified Mess Part 2
// ==================== // ====================
div.problem { div.problem {
hr { hr {
float: none; float: none;
clear: both; clear: both;
...@@ -907,7 +910,7 @@ div.problem { ...@@ -907,7 +910,7 @@ div.problem {
padding: lh(); padding: lh();
border: 1px solid $gray-l3; border: 1px solid $gray-l3;
} }
.detailed-solution { .detailed-solution {
> p:first-child { > p:first-child {
@extend %t-strong; @extend %t-strong;
...@@ -1159,7 +1162,7 @@ div.problem { ...@@ -1159,7 +1162,7 @@ div.problem {
// +Problem - Rubric // +Problem - Rubric
// ==================== // ====================
div.problem { div.problem {
.rubric { .rubric {
tr { tr {
...@@ -1216,7 +1219,7 @@ div.problem { ...@@ -1216,7 +1219,7 @@ div.problem {
} }
// +Problem - Annotation // +Problem - Annotation
// ==================== // ====================
div.problem { div.problem {
.annotation-input { .annotation-input {
margin: 0 0 1em 0; margin: 0 0 1em 0;
...@@ -1318,7 +1321,7 @@ div.problem { ...@@ -1318,7 +1321,7 @@ div.problem {
} }
// +Problem - Choice Text Group // +Problem - Choice Text Group
// ==================== // ====================
div.problem { div.problem {
.choicetextgroup { .choicetextgroup {
@extend .choicegroup; @extend .choicegroup;
......
...@@ -302,7 +302,7 @@ div.course-wrapper { ...@@ -302,7 +302,7 @@ div.course-wrapper {
} }
@media print { @media print {
padding: 0 2mm; padding: 4mm 2mm 0;
background: transparent !important; background: transparent !important;
} }
} }
......
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
padding: ($baseline*0.75); padding: ($baseline*0.75);
background-color: $gray-l3; background-color: $gray-l3;
@media print {
display: none;
}
.preview-menu { .preview-menu {
@extend %inner-wrapper; @extend %inner-wrapper;
width: auto; width: auto;
......
...@@ -673,7 +673,6 @@ body.discussion { ...@@ -673,7 +673,6 @@ body.discussion {
// inline discussion module and profile thread styling // inline discussion module and profile thread styling
.discussion-module { .discussion-module {
@extend .discussion-body; @extend .discussion-body;
@extend %ui-print-excluded;
position: relative; position: relative;
margin: $baseline 0; margin: $baseline 0;
...@@ -1019,6 +1018,10 @@ body.discussion { ...@@ -1019,6 +1018,10 @@ body.discussion {
} }
} }
.xblock-student_view-discussion {
@extend %ui-print-excluded;
}
// ==================== // ====================
// post pagination // post pagination
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment