Skip to content

E
edx-ora2
Commit 3baa6f21 by Brian Talbot
Options

proofing submit-based actions: 

* making style rules simpler/universal for all step__actions
* proofing icon/copy of action are displayed inline together
parent 1bf6b287
Showing with 5 additions and 167 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/views/_oa-base.scss
...@@ -248,6 +248,10 @@ ...@@ -248,6 +248,10 @@
@extend %btn--primary; @extend %btn--primary;
@extend %action-4; @extend %action-4;
.copy, .ico {
display: inline;
}
.ico { .ico {
@extend %t-icon-l; @extend %t-icon-l;
} }
...@@ -263,7 +267,7 @@ ...@@ -263,7 +267,7 @@
margin-bottom: ($baseline-v/2); margin-bottom: ($baseline-v/2);
@include media($bp-ds) { @include media($bp-ds) {
@include span-columns(3 of 6); @include span-columns(4 of 6);
margin-bottom: 0; margin-bottom: 0;
text-align: left; text-align: left;
} }
...@@ -627,62 +631,6 @@ ...@@ -627,62 +631,6 @@
margin-right: ($baseline-v/2); 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 @@ ...@@ -819,61 +767,6 @@
@extend %btn--primary; @extend %btn--primary;
@extend %action-4; @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 @@ ...@@ -965,61 +858,6 @@
@extend %btn--primary; @extend %btn--primary;
@extend %action-4; @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