Skip to content

E
edx-platform
Commit c56fb6f3 by kimth
Options

Merge pull request #440 from MITx/feature/kfiedler/courseware-style 

BUG SMASH
parents b5c60530 09973bd8
Showing with 229 additions and 235 deletions
common/lib/xmodule/xmodule/css/capa/display.scss
h2 {
margin-top: 0;
margin-bottom: 15px;
width: flex-grid(2, 9);
padding-right: flex-gutter(9);
border-right: 1px dashed #ddd;
@include box-sizing(border-box);
display: table-cell;
vertical-align: top;
&.problem-header {
section.staff {
margin-top: 30px;
font-size: 80%;
margin-top: 0;
margin-bottom: 15px;
width: flex-grid(2, 9);
padding-right: flex-gutter(9);
border-right: 1px dashed #ddd;
@include box-sizing(border-box);
display: table-cell;
vertical-align: top;
&.problem-header {
section.staff {
margin-top: 30px;
font-size: 80%;
}
}
}
@media screen and (max-width:1120px) {
display: block;
width: auto;
border-right: 0;
}
@media print {
display: block;
width: auto;
border-right: 0;
}
}
section.problem {
display: table-cell;
width: flex-grid(7, 9);
padding-left: flex-gutter(9);
@media screen and (max-width:1120px) {
display: block;
width: auto;
padding: 0;
}
@media print {
display: block;
width: auto;
padding: 0;
@media screen and (max-width:1120px) {
display: block;
width: auto;
border-right: 0;
}
canvas, img {
page-break-inside: avoid;
@media print {
display: block;
width: auto;
border-right: 0;
}
}
section.problem {
display: table-cell;
width: flex-grid(7, 9);
padding-left: flex-gutter(9);
div {
p.status {
text-indent: -9999px;
margin: -1px 0 0 10px;
@media screen and (max-width:1120px) {
display: block;
width: auto;
padding: 0;
}
&.unanswered {
p.status {
@include inline-block();
background: url('../images/unanswered-icon.png') center center no-repeat;
height: 14px;
width: 14px;
}
}
@media print {
display: block;
width: auto;
padding: 0;
&.processing {
p.status {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
width: 20px;
text-indent: -9999px;
canvas, img {
page-break-inside: avoid;
}
}
&.correct, &.ui-icon-check {
p.status {
@include inline-block();
background: url('../images/correct-icon.png') center center no-repeat;
height: 20px;
width: 25px;
}
input {
border-color: green;
}
}
&.processing {
div {
p.status {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
width: 20px;
}
input {
border-color: #aaa;
text-indent: -9999px;
margin: -1px 0 0 10px;
}
}
&.incorrect, &.ui-icon-close {
p.status {
@include inline-block();
background: url('../images/incorrect-icon.png') center center no-repeat;
height: 20px;
width: 20px;
text-indent: -9999px;
&.unanswered {
p.status {
@include inline-block();
background: url('../images/unanswered-icon.png') center center no-repeat;
height: 14px;
width: 14px;
}
}
input {
border-color: red;
&.processing {
p.status {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
width: 20px;
text-indent: -9999px;
}
}
}
> span {
display: block;
margin-bottom: lh(.5);
}
&.correct, &.ui-icon-check {
p.status {
@include inline-block();
background: url('../images/correct-icon.png') center center no-repeat;
height: 20px;
width: 25px;
}
p.answer {
@include inline-block();
margin-bottom: 0;
margin-left: 10px;
input {
border-color: green;
}
}
&:before {
content: "Answer: ";
font-weight: bold;
display: inline;
&.processing {
p.status {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
width: 20px;
}
}
&:empty {
&:before {
display: none;
input {
border-color: #aaa;
}
}
}
div.equation {
clear: both;
padding: 6px;
background: #eee;
&.incorrect, &.ui-icon-close {
p.status {
@include inline-block();
background: url('../images/incorrect-icon.png') center center no-repeat;
height: 20px;
width: 20px;
text-indent: -9999px;
}
span {
margin-bottom: 0;
input {
border-color: red;
}
}
}
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;
> span {
display: block;
margin-bottom: lh(.5);
}
&.processing, &.ui-icon-processing {
p.answer {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
position: relative;
top: 6px;
width: 25px;
}
margin-bottom: 0;
margin-left: 10px;
&.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;
}
&:before {
content: "Answer: ";
font-weight: bold;
display: inline;
&.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;
}
&:empty {
&:before {
display: none;
}
}
}
}
}
ul {
list-style: disc outside none;
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
}
ol {
list-style: decimal outside none;
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
}
div.equation {
clear: both;
padding: 6px;
background: #eee;
dl {
line-height: 1.4em;
}
span {
margin-bottom: 0;
}
}
dl dt {
font-weight: bold;
}
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;
}
dl dd {
margin-bottom: 0;
}
&.processing, &.ui-icon-processing {
@include inline-block();
background: url('../images/spinner.gif') center center no-repeat;
height: 20px;
position: relative;
top: 6px;
width: 25px;
}
dd {
margin-left: .5em;
margin-left: .5rem;
}
&.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;
}
li {
line-height: 1.4em;
margin-bottom: lh(.5);
&.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;
}
}
}
&:last-child {
margin-bottom: 0;
ul {
list-style: disc outside none;
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
}
}
p {
margin-bottom: lh();
}
ol {
list-style: decimal outside none;
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
}
table {
margin-bottom: lh();
width: 100%;
// border: 1px solid #ddd;
border-collapse: collapse;
dl {
line-height: 1.4em;
}
th {
// border-bottom: 2px solid #ccc;
dl dt {
font-weight: bold;
text-align: left;
}
td {
// border: 1px solid #ddd;
dl dd {
margin-bottom: 0;
}
caption, th, td {
padding: .25em .75em .25em 0;
padding: .25rem .75rem .25rem 0;
dd {
margin-left: .5em;
margin-left: .5rem;
}
caption {
background: #f1f1f1;
margin-bottom: .75em;
margin-bottom: .75rem;
padding: .75em 0;
padding: .75rem 0;
li {
line-height: 1.4em;
margin-bottom: lh(.5);
&:last-child {
margin-bottom: 0;
}
}
tr, td, th {
vertical-align: middle;
p {
margin-bottom: lh();
}
}
table {
margin-bottom: lh();
border-collapse: collapse;
table-layout: auto;
hr {
background: #ddd;
border: none;
clear: both;
color: #ddd;
float: none;
height: 1px;
margin: 0 0 .75rem;
width: 100%;
}
th {
font-weight: bold;
text-align: left;
}
.hidden {
display: none;
visibility: hidden;
}
caption, th, td {
padding: .25em .75em .25em 0;
padding: .25rem .75rem .25rem 0;
}
#{$all-text-inputs} {
display: inline;
width: auto;
}
caption {
background: #f1f1f1;
margin-bottom: .75em;
margin-bottom: .75rem;
padding: .75em 0;
padding: .75rem 0;
}
// this supports a deprecated element and should be removed once the center tag is removed
center {
display: block;
margin: lh() 0;
border: 1px solid #ccc;
padding: lh();
}
tr, td, th {
vertical-align: middle;
}
}
hr {
background: #ddd;
border: none;
clear: both;
color: #ddd;
float: none;
height: 1px;
margin: 0 0 .75rem;
width: 100%;
}
.hidden {
display: none;
visibility: hidden;
}
#{$all-text-inputs} {
display: inline;
width: auto;
}
// this supports a deprecated element and should be removed once the center tag is removed
center {
display: block;
margin: lh() 0;
border: 1px solid #ccc;
padding: lh();
}
}
common/lib/xmodule/xmodule/css/video/display.scss
......@@ -171,7 +171,7 @@ div.video {
position: relative;
@include transition();
-webkit-font-smoothing: antialiased;
width: 110px;
width: 116px;
h3 {
color: #999;
......@@ -209,7 +209,7 @@ div.video {
display: none;
opacity: 0;
position: absolute;
width: 125px;
width: 133px;
z-index: 10;
li {
......
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