Skip to content

E
edx-ora2
Commit e508f871 by Brian Talbot
Options

Merge pull request #145 from edx/talbs/ui-studioproofing 

Proofing UI in Studio Context
parents 0d71cad7 3baa6f21
Showing with 24 additions and 172 deletions
apps/openassessment/xblock/static/css/openassessment.css
This source diff could not be displayed because it is too large. You can view the blob instead.
apps/openassessment/xblock/static/sass/oa/utilities/_shame.scss
......@@ -3,13 +3,13 @@
// NOTES: use for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css)
// --------------------
// LMS countermeasures
// --------------------
// rules ot overcome any poorly defined, scoped, or architected edX LMS-based CSS. Ideally this file will be removed when the LMS Front End is re-visited.
.openassessment {
// --------------------
// LMS countermeasures
// --------------------
// rules to overcome any poorly defined, scoped, or architected edX LMS-based CSS. Ideally this file will be removed when the LMS Front End is re-visited.
// headers
.self-assessment__display__header, .peer-assessment__display__header, .step__header {
margin-bottom: 0 !important;
......@@ -134,4 +134,18 @@
display: block !important;
}
}
// --------------------
// Studio countermeasures
// --------------------
// rules to overcome any poorly defined, scoped, or architected edX Studio problem preview/rendering CSS.
.ico {
font-style: normal;
}
.step__title .step__deadline {
letter-spacing: normal;
text-transform: none;
}
}
apps/openassessment/xblock/static/sass/oa/views/_oa-base.scss
......@@ -248,6 +248,10 @@
@extend %btn--primary;
@extend %action-4;
.copy, .ico {
display: inline;
}
.ico {
@extend %t-icon-l;
}
......@@ -263,7 +267,7 @@
margin-bottom: ($baseline-v/2);
@include media($bp-ds) {
@include span-columns(3 of 6);
@include span-columns(4 of 6);
margin-bottom: 0;
text-align: left;
}
......@@ -627,62 +631,6 @@
margin-right: ($baseline-v/2);
}
}
// STATE: has error
&.has--error {
@include row();
background: tint($color-error, 90%);
.message {
display: block;
@include media($bp-ds) {
@include span-columns(3 of 6);
text-align: left;
}
@include media($bp-dm) {
@include span-columns(6 of 12);
margin-bottom: 0;
text-align: left;
}
@include media($bp-dl) {
@include span-columns(6 of 12);
text-align: left;
}
@include media($bp-dx) {
@include span-columns(6 of 12);
text-align: left;
}
}
.list--actions {
display: block;
margin-bottom: ($baseline-v/2);
@include media($bp-ds) {
@include span-columns(3 of 6);
margin-bottom: 0;
}
@include media($bp-dm) {
@include span-columns(6 of 12);
margin-bottom: 0;
}
@include media($bp-dl) {
@include span-columns(6 of 12);
margin-bottom: 0;
}
@include media($bp-dx) {
@include span-columns(6 of 12);
margin-bottom: 0;
}
}
}
}
}
......@@ -819,61 +767,6 @@
@extend %btn--primary;
@extend %action-4;
}
// STATE: has error
&.has--error {
@include row();
background: tint($color-error, 90%);
.message {
display: block;
margin-bottom: ($baseline-v/2);
@include media($bp-ds) {
@include span-columns(3 of 6);
margin-bottom: 0;
text-align: left;
}
@include media($bp-dm) {
@include span-columns(6 of 12);
margin-bottom: 0;
text-align: left;
}
@include media($bp-dl) {
@include span-columns(6 of 12);
margin-bottom: 0;
text-align: left;
}
@include media($bp-dx) {
@include span-columns(6 of 12);
margin-bottom: 0;
text-align: left;
}
}
.list--actions {
display: block;
@include media($bp-ds) {
@include span-columns(3 of 6);
}
@include media($bp-dm) {
@include span-columns(6 of 12);
}
@include media($bp-dl) {
@include span-columns(6 of 12);
}
@include media($bp-dx) {
@include span-columns(6 of 12);
}
}
}
}
}
......@@ -965,61 +858,6 @@
@extend %btn--primary;
@extend %action-4;
}
// STATE: has error
&.has--error {
@include row();
background: tint($color-error, 90%);
.message {
display: block;
margin-bottom: ($baseline-v/2);
@include media($bp-ds) {
@include span-columns(3 of 6);
margin-bottom: 0;
text-align: left;
}
@include media($bp-dm) {
@include span-columns(6 of 12);
margin-bottom: 0;
text-align: left;
}
@include media($bp-dl) {
@include span-columns(6 of 12);
margin-bottom: 0;
text-align: left;
}
@include media($bp-dx) {
@include span-columns(6 of 12);
margin-bottom: 0;
text-align: left;
}
}
.list--actions {
display: block;
@include media($bp-ds) {
@include span-columns(3 of 6);
}
@include media($bp-dm) {
@include span-columns(6 of 12);
}
@include media($bp-dl) {
@include span-columns(6 of 12);
}
@include media($bp-dx) {
@include span-columns(6 of 12);
}
}
}
}
}
......
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