Skip to content

E
edx-ora2
Commit 0757dbb7 by Brian Talbot
Options

Merge pull request #240 from edx/talbs/fix-inline-errors 

FIX - Inline Error Message Display
parents e3e38a95 32e93ce9
Showing with 17 additions and 138 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
......@@ -161,6 +161,11 @@
box-shadow: none !important;
}
// messages
.message p {
color: inherit;
}
// --------------------
// Studio countermeasures
// --------------------
......
apps/openassessment/xblock/static/sass/oa/views/_oa-base.scss
......@@ -11,143 +11,6 @@
.openassessment {
// --------------------
// general: messages
// --------------------
.message {
margin-bottom: $baseline-v;
border-radius: ($baseline-v/10);
padding: $baseline-v ($baseline-h/2);
background: $color-decorative-quaternary;
.message__title {
@extend %t-heading;
margin-bottom: ($baseline-v/4);
border-bottom: ($baseline-v/10) solid $color-decorative-tertiary;
padding-bottom: ($baseline-v/4);
}
.message__content {
@extend %copy-3;
color: $copy-secondary-color;
p {
margin-bottom: ($baseline-v/2);
&:last-child {
@extend %wipe-last-child;
}
}
a {
@extend %link-copy;
}
}
}
// TYPE: error
.message--error {
background: tint($color-error, 95%);
.message__title {
color: $color-error;
border-bottom-color: $color-error;
}
}
// TYPE: warning
.message--warning {
background: tint($color-warning, 95%);
.message__title {
color: $color-warning;
border-bottom-color: $color-warning;
}
}
// TYPE: confirmation
.message--confirmation {
background: tint($color-confirm, 95%);
.message__title {
color: $color-confirm;
border-bottom-color: $color-confirm;
}
}
// TYPE: complete
.message--complete {
background: tint($color-complete, 95%);
.message__title {
color: $color-complete;
border-bottom-color: $color-complete;
}
}
// TYPE: incomplete
.message--incomplete {
background: tint($color-incomplete, 95%);
.message__title {
color: $color-incomplete;
border-bottom-color: $color-incomplete;
}
}
// CASE: showing errors is shown
.message--error {
@extend %trans-opacity;
display: none;
opacity: 0.0;
}
.has--error {
.message--error {
display: block;
opacity: 1.0;
}
}
// TYPE: inline message
.message--inline {
padding: ($baseline-v/2) ($baseline-h/2);
background: tint($color-confirm, 15%);
.message__title {
margin-bottom: 0;
border: none;
padding-bottom: 0;
color: $white-t;
}
&.message--error {
background: tint($color-error, 15%);
.message__content {
color: tint($color-error, 90%);
}
}
&.message--warning {
background: tint($color-warning, 15%);
.message__content {
color: tint($color-warning, 90%);
}
}
&.message--confirm {
background: tint($color-confirm, 15%);
.message__content {
color: tint($color-confirm, 90%);
}
}
}
// --------------------
// general: chrome
// --------------------
.openassessment__title {
......
apps/openassessment/xblock/static/sass/xb/elements/_system-feedback.scss
......@@ -115,19 +115,30 @@
border: none;
padding-bottom: 0;
color: $white-t;
text-align: center;
}
&.message--error {
background: tint($color-error, 15%);
.message__content {
color: tint($color-error, 90%);
}
}
&.message--warning {
background: tint($color-warning, 15%);
.message__content {
color: tint($color-warning, 90%);
}
}
&.message--confirm {
background: tint($color-warning, 15%);
.message__content {
color: tint($color-confirm, 90%);
}
}
}
......
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