Skip to content

E
edx-platform
Commit 77e57448 by marco
Options

cleaned up sass document format and added baseline variable throughout capa and… 

cleaned up sass document format and added baseline variable throughout capa and combined open ended problems. no style rule changes, simply whitespace, ordering of properties, and the addition of baseline over direct pixels for padding and margins.
parent 12a2c06f
Showing with 368 additions and 350 deletions
common/lib/xmodule/xmodule/css/capa/display.scss
......@@ -19,10 +19,10 @@ h2 {
iframe[seamless]{
background-color: transparent;
border: 0px none transparent;
padding: 0px;
overflow: hidden;
padding: 0px;
border: 0px none transparent;
background-color: transparent;
}
.inline-error {
......@@ -31,17 +31,17 @@ iframe[seamless]{
section.problem-progress {
display: inline-block;
padding-left: 5px;
color: #999;
font-size: em(16);
font-weight: 100;
padding-left: 5px;
font-size: em(16);
}
section.problem {
@media print {
display: block;
width: auto;
padding: 0;
width: auto;
canvas, img {
page-break-inside: avoid;
......@@ -54,25 +54,24 @@ section.problem {
.choicegroup {
@include clearfix;
min-width: 100px;
width: auto !important;
width: 100px;
label.choicegroup_correct{
&:after{
label.choicegroup_correct {
&:after {
margin-left: 15px;
content: url('../images/correct-icon.png');
margin-left:15px
}
}
label.choicegroup_incorrect{
&:after{
label.choicegroup_incorrect {
&:after {
margin-left: 15px;
content: url('../images/incorrect-icon.png');
margin-left:15px;
}
}
min-width:100px;
width: auto !important;
width: 100px;
.indicator_container {
float: left;
width: 25px;
......@@ -82,9 +81,9 @@ section.problem {
fieldset {
@include box-sizing(border-box);
margin: 0px 0px $baseline;
padding-left: $baseline;
border-left: 1px solid #ddd;
padding-left: 20px;
margin: 0px 0px 20px;
}
input[type="radio"],
......@@ -102,21 +101,21 @@ section.problem {
ol.enumerate {
li {
&:before {
content: " ";
display: block;
height: 0;
visibility: hidden;
height: 0;
content: " ";
}
}
}
.solution-span {
> span {
margin: 20px 0;
margin: $baseline 0;
display: block;
border: 1px solid #ddd;
padding: 9px 15px 20px;
background: #FFF;
padding: 9px 15px $baseline;
background: #fff;
position: relative;
box-shadow: inset 0 0 0 1px #eee;
border-radius: 3px;
......@@ -133,26 +132,26 @@ section.problem {
margin-top: -2px;
}
&.status {
margin: 8px 0 0 $baseline/2;
text-indent: -9999px;
margin: 8px 0 0 10px;
}
}
&.unanswered {
p.status {
@include inline-block();
background: url('../images/unanswered-icon.png') center center no-repeat;
height: 14px;
width: 14px;
height: 14px;
background: url('../images/unanswered-icon.png') center center no-repeat;
}
}
&.correct, &.ui-icon-check {
p.status {
@include inline-block();
background: url('../images/correct-icon.png') center center no-repeat;
height: 20px;
width: 25px;
height: 20px;
background: url('../images/correct-icon.png') center center no-repeat;
}
input {
......@@ -163,9 +162,9 @@ section.problem {
&.processing {
p.status {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
width: 20px;
height: 20px;
background: url('../images/spinner.gif') center center no-repeat;
}
input {
......@@ -176,9 +175,9 @@ section.problem {
&.incorrect, &.ui-icon-close {
p.status {
@include inline-block();
background: url('../images/incorrect-icon.png') center center no-repeat;
height: 20px;
width: 20px;
height: 20px;
background: url('../images/incorrect-icon.png') center center no-repeat;
text-indent: -9999px;
}
......@@ -195,12 +194,12 @@ section.problem {
p.answer {
@include inline-block();
margin-bottom: 0;
margin-left: 10px;
margin-left: $baseline/2;
&:before {
display: inline;
content: "Answer: ";
font-weight: bold;
display: inline;
}
&:empty {
......@@ -218,12 +217,12 @@ section.problem {
margin-bottom: 0;
&.math {
@include inline-block;
padding: 6px;
background: #f1f1f1;
min-width: 30px;
border: 1px solid #e3e3e3;
@include inline-block;
border-radius: 4px;
min-width: 30px;
background: #f1f1f1;
}
}
}
......@@ -231,98 +230,92 @@ section.problem {
span {
&.unanswered, &.ui-icon-bullet {
@include inline-block();
background: url('../images/unanswered-icon.png') center center no-repeat;
height: 14px;
position: relative;
top: 4px;
width: 14px;
height: 14px;
background: url('../images/unanswered-icon.png') center center no-repeat;
}
&.processing, &.ui-icon-processing {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
position: relative;
top: 6px;
width: 25px;
height: 20px;
background: url('../images/spinner.gif') center center no-repeat;
}
&.correct, &.ui-icon-check {
@include inline-block();
background: url('../images/correct-icon.png') center center no-repeat;
height: 20px;
position: relative;
top: 3px;
width: 25px;
height: 20px;
background: url('../images/correct-icon.png') center center no-repeat;
}
&.partially-correct {
@include inline-block();
background: url('../images/partially-correct-icon.png') center center no-repeat;
height: 20px;
position: relative;
top: 6px;
width: 25px;
height: 20px;
background: url('../images/partially-correct-icon.png') center center no-repeat;
}
&.incorrect, &.ui-icon-close {
@include inline-block();
background: url('../images/incorrect-icon.png') center center no-repeat;
height: 20px;
width: 20px;
position: relative;
top: 3px;
width: 20px;
height: 20px;
background: url('../images/incorrect-icon.png') center center no-repeat;
}
}
.reload
{
.reload {
float:right;
margin: 10px;
margin: $baseline/2;
}
.grader-status {
@include clearfix;
margin-bottom: $baseline;
padding: 9px;
background: #F6F6F6;
border: 1px solid #ddd;
border-top: 0;
margin-bottom: 20px;
@include clearfix;
background: #F6F6F6;
span {
text-indent: -9999px;
overflow: hidden;
display: block;
float: left;
overflow: hidden;
margin: -7px 7px 0 0;
text-indent: -9999px;
}
.grading {
background: url('../images/info-icon.png') left center no-repeat;
margin: 0px 7px 0 0;
padding-left: 25px;
background: url('../images/info-icon.png') left center no-repeat;
text-indent: 0px;
margin: 0px 7px 0 0;
}
p {
line-height: 20px;
text-transform: capitalize;
margin-bottom: 0;
float: left;
margin-bottom: 0;
text-transform: capitalize;
line-height: 20px;
}
&.file {
background: #FFF;
margin-top: 20px;
padding: 20px 0 0 0;
border: {
top: 1px solid #eee;
right: 0;
bottom: 0;
left: 0;
}
background: #fff;
margin-top: $baseline;
padding: $baseline 0 0 0;
border: 0;
border-top: 1px solid #eee;
p.debug {
display: none;
......@@ -343,7 +336,7 @@ section.problem {
.feedback-on-feedback {
height: 100px;
margin-right: 20px;
margin-right: $baseline;
}
.evaluation-response {
......@@ -357,32 +350,32 @@ section.problem {
.evaluation-scoring {
.scoring-list {
list-style-type: none;
margin-left: 3px;
list-style-type: none;
li {
display:inline;
margin-left: 50px;
&:first-child {
margin-left: 0px;
}
display:inline;
margin-left: 50px;
label {
font-size: .9em;
}
}
}
}
.submit-message-container {
margin: 10px 0px ;
margin: $baseline 0px ;
}
}
form.option-input {
margin: -10px 0 20px;
padding-bottom: 20px;
margin: -$baseline/2 0 $baseline;
padding-bottom: $baseline;
select {
margin-right: flex-gutter();
......@@ -390,17 +383,17 @@ section.problem {
}
ul {
list-style: disc outside none;
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
list-style: disc outside none;
}
ol {
list-style: decimal outside none;
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
list-style: decimal outside none;
}
dl {
......@@ -421,8 +414,8 @@ section.problem {
}
li {
line-height: 1.4em;
margin-bottom: lh(.5);
line-height: 1.4em;
&:last-child {
margin-bottom: 0;
......@@ -439,8 +432,8 @@ section.problem {
table-layout: auto;
th {
font-weight: bold;
text-align: left;
font-weight: bold;
}
td {
......@@ -453,44 +446,43 @@ section.problem {
}
caption {
background: #f1f1f1;
margin-bottom: .75em;
margin-bottom: .75rem;
padding: .75em 0;
padding: .75rem 0;
background: #f1f1f1;
}
tr, td, th {
vertical-align: middle;
}
}
code {
margin: 0 2px;
padding: 0px 5px;
white-space: nowrap;
border: 1px solid #EAEAEA;
background-color: #F8F8F8;
border: 1px solid #eaeaea;
border-radius: 3px;
background-color: #f8f8f8;
white-space: nowrap;
font-size: .9em;
}
pre {
background-color: #F8F8F8;
border: 1px solid #CCC;
font-size: .9em;
line-height: 1.4;
overflow: auto;
padding: 6px 10px;
padding: 6px $baseline/2;
border: 1px solid #ccc;
border-radius: 3px;
background-color: #f8f8f8;
font-size: .9em;
line-height: 1.4;
> code {
margin: 0;
padding: 0;
white-space: pre;
border: none;
background: transparent;
white-space: pre;
}
}
......@@ -507,26 +499,25 @@ section.problem {
}
pre {
border-radius: 0;
border-radius: 0;
border-width: 0;
overflow: hidden;
margin: 0;
padding: 0;
border-width: 0;
border-radius: 0;
background: transparent;
font-family: inherit;
font-size: inherit;
white-space: pre;
word-wrap: normal;
overflow: hidden;
font-size: inherit;
font-family: inherit;
resize: none;
&.CodeMirror-cursor {
z-index: 10;
position: absolute;
z-index: 10;
visibility: hidden;
border-left: 1px solid black;
border-right: none;
width: 0;
border-right: none;
border-left: 1px solid black;
}
}
}
......@@ -536,14 +527,14 @@ section.problem {
}
hr {
background: #ddd;
border: none;
clear: both;
color: #ddd;
float: none;
height: 1px;
clear: both;
margin: 0 0 .75rem;
width: 100%;
height: 1px;
border: none;
background: #ddd;
color: #ddd;
}
.hidden {
......@@ -560,17 +551,17 @@ section.problem {
center {
display: block;
margin: lh() 0;
border: 1px solid #ccc;
padding: lh();
border: 1px solid #ccc;
}
section.action {
margin-top: 20px;
margin-top: $baseline;
.save, .check, .show {
height: ($baseline*2);
font-weight: 600;
vertical-align: middle;
font-weight: 600;
}
.save {
......@@ -580,8 +571,8 @@ section.problem {
.show {
.show-label {
font-size: 1.0em;
font-weight: 600;
font-size: 1.0em;
}
}
......@@ -592,20 +583,20 @@ section.problem {
// padding: 8px 12px;
// margin-top: 10px;
@include inline-block;
font-style: italic;
margin: 8px 0 0 10px;
margin: 8px 0 0 $baseline/2;
color: #777;
font-style: italic;
-webkit-font-smoothing: antialiased;
}
}
.detailed-solution {
> p:first-child {
font-size: 0.9em;
color: #aaa;
text-transform: uppercase;
font-weight: bold;
font-style: normal;
text-transform: uppercase;
color: #AAA;
font-size: 0.9em;
}
p:last-child {
......@@ -614,12 +605,12 @@ section.problem {
}
div.capa_alert {
margin-top: $baseline;
padding: 8px 12px;
border: 1px solid #EBE8BF;
border: 1px solid #ebe8bf;
border-radius: 3px;
background: #FFFCDD;
background: #fffcdd;
font-size: 0.9em;
margin-top: 10px;
}
div.capa_reset {
......@@ -628,12 +619,14 @@ section.problem {
background-color: lighten($error-red, 25%);
border-radius: 3px;
font-size: 1em;
margin-top: 10px;
margin-bottom: 10px;
margin-top: $baseline/2;
margin-bottom: $baseline/2;
}
.capa_reset>h2 {
color: #AA0000;
color: #aa0000;
}
.capa_reset li {
font-size: 0.9em;
}
......@@ -642,10 +635,10 @@ section.problem {
border: 1px solid #ccc;
h3 {
border-bottom: 1px solid #e3e3e3;
text-shadow: 0 1px 0 #fff;
padding: 9px;
border-bottom: 1px solid #e3e3e3;
background: #eee;
text-shadow: 0 1px 0 #fff;
font-weight: bold;
font-size: em(16);
}
......@@ -665,7 +658,7 @@ section.problem {
a {
display: block;
padding: 9px;
background: #F6F6F6;
background: #f6f6f6;
box-shadow: inset 0 0 0 1px #fff;
}
}
......@@ -683,22 +676,22 @@ section.problem {
margin-bottom: 12px;
h3 {
font-size: 0.9em;
color: #aaa;
text-transform: uppercase;
font-weight: bold;
font-style: normal;
text-transform: uppercase;
color: #AAA;
font-size: 0.9em;
}
}
> section {
border: 1px solid #ddd;
padding: 9px 9px 20px;
margin-bottom: 10px;
background: #FFF;
position: relative;
box-shadow: inset 0 0 0 1px #eee;
margin-bottom: $baseline/2;
padding: 9px 9px $baseline;
border: 1px solid #ddd;
border-radius: 3px;
background: #fff;
box-shadow: inset 0 0 0 1px #eee;
p:last-of-type {
margin-bottom: 0;
......@@ -709,26 +702,27 @@ section.problem {
}
a.full {
@include position(absolute, 0 0 1px 0px);
font-size: .8em;
@include position(absolute, 0 0 1px 0);
@include box-sizing(border-box);
display: block;
padding: 4px;
text-align: right;
width: 100%;
display: block;
background: #F3F3F3;
@include box-sizing(border-box);
background: #f3f3f3;
text-align: right;
font-size: .8em;
}
}
}
.external-grader-message {
section {
padding-left: 20px;
background-color: #FAFAFA;
color: #2C2C2C;
font-family: monospace;
padding-top: $baseline/2;
padding-left: $baseline;
background-color: #fafafa;
color: #2c2c2c;
font-size: 1em;
padding-top: 10px;
font-family: monospace;
header {
font-size: 1.4em;
}
......@@ -738,35 +732,36 @@ section.problem {
}
.longform {
padding: 0px;
margin: 0px;
margin: 0;
padding: 0;
.result-errors {
margin: 5px;
padding: 10px 10px 10px 40px;
margin: $baseline/4;
padding: $baseline/2 $baseline/2 $baseline/2 $baseline*2;
background: url('../images/incorrect-icon.png') center left no-repeat;
li {
color: #B00;
color: #b00;
}
}
.result-output {
margin: 5px;
padding: 20px 0px 15px 50px;
border-top: 1px solid #DDD;
border-left: 20px solid #FAFAFA;
margin: $baseline/4;
padding: $baseline 0 15px 50px;
border-top: 1px solid #ddd;
border-left: $baseline solid #fafafa;
h4 {
font-family: monospace;
font-size: 1em;
font-family: monospace;
}
dl {
margin: 0px;
margin: 0;
}
dt {
margin-top: 20px;
margin-top: $baseline;
}
dd {
......@@ -776,6 +771,7 @@ section.problem {
.result-correct {
background: url('../images/correct-icon.png') left 20px no-repeat;
.result-actual-output {
color: #090;
}
......@@ -783,6 +779,7 @@ section.problem {
.result-incorrect {
background: url('../images/incorrect-icon.png') left 20px no-repeat;
.result-actual-output {
color: #B00;
}
......@@ -790,16 +787,16 @@ section.problem {
.markup-text{
margin: 5px;
padding: 20px 0px 15px 50px;
border-top: 1px solid #DDD;
border-left: 20px solid #FAFAFA;
padding: $baseline 0 15px 50px;
border-top: 1px solid #ddd;
border-left: 20px solid #fafafa;
bs {
color: #BB0000;
color: #bb0000;
}
bg {
color: #BDA046;
color: #bda046;
}
}
}
......@@ -808,44 +805,52 @@ section.problem {
.rubric {
tr {
margin:10px 0px;
margin: $baseline/2 0;
height: 100%;
}
td {
padding: 20px 0px;
margin: 10px 0px;
margin: $baseline/2 0;
padding: $baseline 0;
height: 100%;
}
th {
padding: 5px;
margin: 5px;
margin: $baseline/4;
padding: $baseline/4;
}
label,
.view-only {
margin:3px;
position: relative;
padding: 15px;
width: 150px;
height:100%;
display: inline-block;
min-height: 50px;
margin: 3px;
padding: 15px;
min-width: 50px;
background-color: #CCC;
min-height: 50px;
width: 150px;
height: 100%;
background-color: #ccc;
font-size: .9em;
}
.grade {
position: absolute;
bottom:0px;
right:0px;
margin:10px;
right: 0;
bottom: 0;
margin: $baseline/2;
}
.selected-grade {
background: #666;
color: white;
}
input[type=radio]:checked + label {
background: #666;
color: white; }
color: white;
}
input[class='score-selection'] {
display: none;
}
......@@ -853,50 +858,57 @@ section.problem {
.annotation-input {
$yellow: rgba(255,255,10,0.3);
margin: 0 0 1em 0;
border: 1px solid #ccc;
border-radius: 1em;
margin: 0 0 1em 0;
.annotation-header {
font-weight: bold;
border-bottom: 1px solid #ccc;
padding: .5em 1em;
border-bottom: 1px solid #ccc;
font-weight: bold;
}
.annotation-body { padding: .5em 1em; }
a.annotation-return {
float: right;
font: inherit;
font-weight: normal;
}
a.annotation-return:after { content: " \2191" }
.block, ul.tags {
margin: .5em 0;
padding: 0;
}
.block-highlight {
padding: .5em;
border: 1px solid darken($yellow, 10%);
background-color: $yellow;
color: #333;
font-style: normal;
background-color: $yellow;
border: 1px solid darken($yellow, 10%);
}
.block-comment { font-style: italic; }
ul.tags {
display: block;
list-style-type: none;
margin-left: 1em;
list-style-type: none;
li {
position: relative;
display: block;
margin: 1em 0 0 0;
position: relative;
.tag {
display: inline-block;
cursor: pointer;
margin-left: $baseline;
border: 1px solid rgb(102,102,102);
margin-left: 40px;
cursor: pointer;
&.selected {
background-color: $yellow;
}
......@@ -908,26 +920,31 @@ section.problem {
.tag-status, .tag { padding: .25em .5em; }
}
}
textarea.comment {
$num-lines-to-show: 5;
$line-height: 1.4em;
$padding: .2em;
width: 100%;
padding: $padding (2 * $padding);
line-height: $line-height;
width: 100%;
height: ($num-lines-to-show * $line-height) + (2*$padding) - (($line-height - 1)/2);
line-height: $line-height;
}
.answer-annotation { display: block; margin: 0; }
/* for debugging the input value field. enable the debug flag on the inputtype */
.debug-value {
color: #fff;
padding: 1em;
margin: 1em 0;
background-color: #999;
padding: 1em;
border: 1px solid #000;
background-color: #999;
color: #fff;
input[type="text"] { width: 100%; }
pre { background-color: #CCC; color: #000; }
&:before {
display: block;
content: "debug input value";
......@@ -937,13 +954,15 @@ section.problem {
}
}
}
.choicetextgroup{
@extend .choicegroup;
input[type="text"]{
margin-bottom: 0.5em;
}
@extend .choicegroup;
label.choicetextgroup_correct, section.choicetextgroup_correct{
label.choicetextgroup_correct, section.choicetextgroup_correct {
@extend label.choicegroup_correct;
input[type="text"] {
......@@ -951,17 +970,18 @@ section.problem {
}
}
label.choicetextgroup_incorrect, section.choicetextgroup_incorrect{
label.choicetextgroup_incorrect, section.choicetextgroup_incorrect {
@extend label.choicegroup_incorrect;
}
label.choicetextgroup_show_correct, section.choicetextgroup_show_correct{
&:after{
content: url('../images/correct-icon.png');
label.choicetextgroup_show_correct, section.choicetextgroup_show_correct {
&:after {
margin-left:15px;
content: url('../images/correct-icon.png');
}
}
span.mock_label{
span.mock_label {
cursor : default;
}
}
......
common/lib/xmodule/xmodule/css/combinedopenended/display.scss
......@@ -18,17 +18,16 @@ h2 {
div.name{
padding-bottom: 15px;
h2{
display: inline;
}
.progress-container
{
.progress-container {
display: inline;
float: right;
padding-top: 3px;
}
}
.inline-error {
......@@ -40,64 +39,60 @@ section.combined-open-ended {
}
div.problemwrapper {
padding: $baseline/4;
border: 1px solid;
border-color: lightgray;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
padding: 5px;
.status-bar
{
float: right;
.status-bar {
display: inline-block;
float: right;
padding: 5px;
.problemtype{
display: inline;
float: left;
background-color: #d4d4d4;
padding: 10px;
padding: $baseline/2;
border-radius: 5px;
background-color: #d4d4d4;
}
.statustable{
.statustable {
width: 750px;
}
.status-container
{
padding-bottom: 5px;
.status-container {
display: inline-block;
padding-bottom: $baseline/4;
}
.problemtype-container{
.problemtype-container {
width: 40%;
padding-top: 12px;
}
.assessments-container{
.assessments-container {
width: 30%;
.assessment-text{
.assessment-text {
display: inline-block;
}
}
}
.item-container
{
.item-container {
@clearfix
padding-bottom: 10px;
display: inline-block;
margin: 0px 15px 0px 15px;
h4 {
padding-top: 10px;
padding-top: $baseline/2;
border-top: 1px solid;
border-color: lightgray;
}
}
.result-container
{
.result-container {
float:left;
width: 100%;
position:relative;
......@@ -105,36 +100,41 @@ div.problemwrapper {
}
section.legend-container {
margin: 15px;
.legenditem {
background-color : #d4d4d4;
font-size: .9em;
padding: 2px;
display: inline;
padding: 2px;
width: 20%;
background-color : #d4d4d4;
font-size: .9em;
}
margin: 15px;
}
section.combined-open-ended-status {
padding: $baseline $baseline $baseline 0;
padding: 20px 20px 20px 0px;
.statusitem {
&:first-child{
display: inline;
padding: $baseline/2;
width: 20%;
background-color : #d4d4d4;
color: #2c2c2c;
font-size: .9em;
&:first-child {
border-bottom-left-radius: 10px;
}
&:last-child{
&:last-child {
border-top-right-radius: 10px;
}
color: #2C2C2C;
background-color : #d4d4d4;
font-size: .9em;
padding: 10px;
display: inline;
width: 20%;
.show-results {
margin-top: .3em;
text-align:right;
}
.show-results-button {
font: 1em monospace;
}
......@@ -148,29 +148,29 @@ section.combined-open-ended-status {
span {
&.unanswered {
@include inline-block();
background: url('../images/unanswered-icon.png') center center no-repeat;
height: 14px;
position: relative;
width: 14px;
float: right;
width: 14px;
height: 14px;
background: url('../images/unanswered-icon.png') center center no-repeat;
}
&.correct {
@include inline-block();
background: url('../images/correct-icon.png') center center no-repeat;
height: 20px;
position: relative;
width: 25px;
float: right;
width: 25px;
height: 20px;
background: url('../images/correct-icon.png') center center no-repeat;
}
&.incorrect {
@include inline-block();
background: url('../images/incorrect-icon.png') center center no-repeat;
height: 20px;
width: 20px;
position: relative;
float: right;
width: 20px;
height: 20px;
background: url('../images/incorrect-icon.png') center center no-repeat;
}
}
......@@ -182,20 +182,22 @@ section.combined-open-ended-status {
}
div.combined-rubric-container {
margin:15px;
ul.rubric-list{
margin: 15px;
padding-bottom: 5px;
padding-top: 10px;
ul.rubric-list {
margin: 4px;
padding: 0;
list-style-type: none;
padding:0;
margin:4px;
li {
&.rubric-list-item{
&.rubric-list-item {
margin-bottom: 2px;
padding: 0px;
}
}
}
h4{
h4 {
padding-top: 10px;
border-top: 1px solid;
border-color: lightgray;
......@@ -205,8 +207,6 @@ div.combined-rubric-container {
font-size: .9em;
font-weight: bold;
}
padding-bottom: 5px;
padding-top: 10px;
}
div.result-container {
......@@ -342,8 +342,8 @@ div.result-container {
section.open-ended-child {
@media print {
display: block;
width: auto;
padding: 0;
width: auto;
canvas, img {
page-break-inside: avoid;
......@@ -357,24 +357,24 @@ section.open-ended-child {
ol.enumerate {
li {
&:before {
content: " ";
display: block;
height: 0;
visibility: hidden;
height: 0;
content: " ";
}
}
}
.solution-span {
> span {
margin: 20px 0;
position: relative;
display: block;
margin: $baseline 0;
padding: 9px 15px $baseline;
border: 1px solid #ddd;
padding: 9px 15px 20px;
background: #FFF;
position: relative;
box-shadow: inset 0 0 0 1px #eee;
border-radius: 3px;
background: #fff;
box-shadow: inset 0 0 0 1px #eee;
&:empty {
display: none;
......@@ -387,8 +387,8 @@ section.open-ended-child {
margin-top: -2px;
}
&.status {
margin: 8px 0 0 $baseline/2;
text-indent: -9999px;
margin: 8px 0 0 10px;
}
}
......@@ -404,9 +404,9 @@ section.open-ended-child {
div.correct, div.ui-icon-check {
p.status {
@include inline-block();
background: url('../images/correct-icon.png') center center no-repeat;
height: 20px;
width: 25px;
height: 20px;
background: url('../images/correct-icon.png') center center no-repeat;
}
input {
......@@ -417,9 +417,9 @@ section.open-ended-child {
div.processing {
p.status {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
width: 20px;
height: 20px;
background: url('../images/spinner.gif') center center no-repeat;
}
input {
......@@ -430,9 +430,9 @@ section.open-ended-child {
div.incorrect, div.ui-icon-close {
p.status {
@include inline-block();
background: url('../images/incorrect-icon.png') center center no-repeat;
height: 20px;
width: 20px;
height: 20px;
background: url('../images/incorrect-icon.png') center center no-repeat;
text-indent: -9999px;
}
......@@ -467,96 +467,90 @@ section.open-ended-child {
span {
&.unanswered, &.ui-icon-bullet {
@include inline-block();
background: url('../images/unanswered-icon.png') center center no-repeat;
height: 14px;
position: relative;
top: 4px;
width: 14px;
height: 14px;
background: url('../images/unanswered-icon.png') center center no-repeat;
}
&.processing, &.ui-icon-processing {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
position: relative;
top: 6px;
width: 25px;
height: 20px;
background: url('../images/spinner.gif') center center no-repeat;
}
&.correct, &.ui-icon-check {
@include inline-block();
background: url('../images/correct-icon.png') center center no-repeat;
height: 20px;
position: relative;
top: 6px;
width: 25px;
height: 20px;
background: url('../images/correct-icon.png') center center no-repeat;
}
&.incorrect, &.ui-icon-close {
@include inline-block();
background: url('../images/incorrect-icon.png') center center no-repeat;
height: 20px;
width: 20px;
position: relative;
top: 6px;
width: 20px;
height: 20px;
background: url('../images/incorrect-icon.png') center center no-repeat;
}
}
.reload
{
.reload {
float:right;
margin: 10px;
}
div.short-form-response {
background: #F6F6F6;
border: 1px solid #ddd;
margin-bottom: 0px;
@include clearfix;
overflow-y: auto;
margin-bottom: 0;
height: 200px;
@include clearfix;
border: 1px solid #ddd;
background: #f6f6f6;
}
.grader-status {
@include clearfix;
margin-bottom: $baseline;
padding: 9px;
background: #F6F6F6;
border: 1px solid #ddd;
border-top: 0;
margin-bottom: 20px;
@include clearfix;
border-top: 0px;
background: #F6F6F6;
span {
text-indent: -9999px;
overflow: hidden;
display: block;
float: left;
overflow: hidden;
margin: -7px 7px 0 0;
text-indent: -9999px;
}
.grading {
background: url('../images/info-icon.png') left center no-repeat;
margin: 0 7px 0 0;
padding-left: 25px;
text-indent: 0px;
margin: 0px 7px 0 0;
background: url('../images/info-icon.png') left center no-repeat;
text-indent: 0;
}
p {
line-height: 20px;
margin-bottom: 0;
float: left;
margin-bottom: 0;
line-height: 20px;
}
&.file {
background: #FFF;
margin-top: 20px;
padding: 20px 0 0 0;
border: {
top: 1px solid #eee;
right: 0;
bottom: 0;
left: 0;
}
margin-top: $baseline;
padding: $baseline 0 0 0;
border: 0;
border-top: 1px solid #eee;
background: #fff;
p.debug {
display: none;
......@@ -570,8 +564,8 @@ section.open-ended-child {
}
form.option-input {
margin: -10px 0 20px;
padding-bottom: 20px;
margin: -$baseline/2 0 $baseline;
padding-bottom: $baseline;
select {
margin-right: flex-gutter();
......@@ -579,29 +573,30 @@ section.open-ended-child {
}
ul {
list-style: disc outside none;
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
list-style: disc outside none;
}
ul.rubric-list{
margin: 0;
padding: 0;
list-style-type: none;
padding:0;
margin:0;
li {
&.rubric-list-item{
margin-bottom: 0px;
padding: 0px;
&.rubric-list-item {
margin-bottom: 0;
padding: 0;
}
}
}
ol {
list-style: decimal outside none;
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
list-style: decimal outside none;
}
dl {
......@@ -622,8 +617,9 @@ section.open-ended-child {
}
li {
margin-bottom: 0px;
padding: 0px;
margin-bottom: 0;
padding: 0;
&:last-child {
margin-bottom: 0;
}
......@@ -634,14 +630,14 @@ section.open-ended-child {
}
hr {
background: #ddd;
border: none;
clear: both;
color: #ddd;
float: none;
height: 1px;
clear: both;
margin: 0 0 .75rem;
width: 100%;
height: 1px;
border: none;
background: #ddd;
color: #ddd;
}
.hidden {
......@@ -655,7 +651,7 @@ section.open-ended-child {
}
section.action {
margin-top: 20px;
margin-top: $baseline;
input.save {
@extend .blue-button !optional;
......@@ -663,20 +659,20 @@ section.open-ended-child {
.submission_feedback {
@include inline-block;
font-style: italic;
margin: 8px 0 0 10px;
margin: 8px 0 0 $baseline/2;
color: #777;
font-style: italic;
-webkit-font-smoothing: antialiased;
}
}
.detailed-solution {
> p:first-child {
font-size: 0.9em;
color: #aaa;
text-transform: uppercase;
font-weight: bold;
font-style: normal;
text-transform: uppercase;
color: #AAA;
font-size: 0.9em;
}
p:last-child {
......@@ -686,45 +682,47 @@ section.open-ended-child {
div.open-ended-alert,
.save_message {
margin-top: $baseline/2;
margin-bottom: $baseline/4;
padding: 8px 12px;
border: 1px solid #EBE8BF;
border: 1px solid #ebe8bf;
border-radius: 3px;
background: #FFFCDD;
background: #fffcdd;
font-size: 0.9em;
margin-top: 10px;
margin-bottom:5px;
}
div.capa_reset {
margin-top: $baseline/2;
margin-bottom: $baseline/2;
padding: 25px;
border: 1px solid $error-red;
background-color: lighten($error-red, 25%);
border-radius: 3px;
background-color: lighten($error-red, 25%);
font-size: 1em;
margin-top: 10px;
margin-bottom: 10px;
}
.capa_reset>h2 {
color: #AA0000;
.capa_reset > h2 {
color: #aa0000;
}
.capa_reset li {
font-size: 0.9em;
}
.assessment-container {
margin: 40px 0px 30px 0px;
.scoring-container
{
p
{
margin: $baseline*2 0px 30px 0px;
.scoring-container {
p {
margin-bottom: 1em;
}
label {
margin: 10px;
padding: 5px;
display: inline-block;
margin: $baseline/2;
padding: $baseline/4;
min-width: 50px;
background-color: #CCC;
background-color: #ccc;
text-size: 1.5em;
}
......@@ -732,20 +730,20 @@ section.open-ended-child {
background: #666;
color: white;
}
input[class='grade-selection'] {
display: none;
}
}
}
div.prompt{
background-color:white;
div.prompt {
background-color: white;
}
h4{
padding-top: 10px;
border-top: 1px solid;
h4 {
padding-top: $baseline/2;
border-color: lightgray;
border-top: 1px solid;
}
}
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