From 5c2586b54fd8fb60ba0e7da9f37e0e7be881cabd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 31 Jan 2019 13:23:21 +0100 Subject: [PATCH] MOBILE-2847 quiz: Review multianswer question styles --- src/addon/mod/quiz/pages/review/review.scss | 5 +++-- .../qtype/gapselect/component/gapselect.scss | 6 ------ .../multianswer/component/multianswer.scss | 10 +++++----- src/app/app.scss | 18 ++++++++++++++++-- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/addon/mod/quiz/pages/review/review.scss b/src/addon/mod/quiz/pages/review/review.scss index ca5b7d400..bb7509562 100644 --- a/src/addon/mod/quiz/pages/review/review.scss +++ b/src/addon/mod/quiz/pages/review/review.scss @@ -3,10 +3,11 @@ ion-app.app-root page-addon-mod-quiz-review { .item-checkbox-disabled, .item-select-disabled, .item-input-disabled, - .text-input[disabled] { + [disabled], + [readonly] { opacity: 0.8; - .label, .radio, .checkbox, .select-disabled, .core-correct-icon, .text-input[disabled] { + .label, .radio, .checkbox, .select-disabled, .core-correct-icon, [disabled], [readonly] { opacity: 1; } } diff --git a/src/addon/qtype/gapselect/component/gapselect.scss b/src/addon/qtype/gapselect/component/gapselect.scss index 5311db7c8..53ceeba30 100644 --- a/src/addon/qtype/gapselect/component/gapselect.scss +++ b/src/addon/qtype/gapselect/component/gapselect.scss @@ -15,11 +15,5 @@ ion-app.app-root addon-qtype-gapselect { border-radius: 4px; margin-bottom: 10px; background: $gray-lighter; - - &.core-question-answer-correct, - &.core-question-answer-incorrect { - background-color: $gray-lighter; - color: $text-color; - } } } diff --git a/src/addon/qtype/multianswer/component/multianswer.scss b/src/addon/qtype/multianswer/component/multianswer.scss index 5d116515e..f63e3e5ca 100644 --- a/src/addon/qtype/multianswer/component/multianswer.scss +++ b/src/addon/qtype/multianswer/component/multianswer.scss @@ -22,12 +22,12 @@ addon-qtype-multianswer { } input, select { + @include border-radius(4px); + display: inline-block; - border: 1px solid #ccc; - padding: 4px 6px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border: 1px solid $gray-dark; + padding: 6px 8px; + @include margin-horizontal(2px); margin-bottom: 10px; } diff --git a/src/app/app.scss b/src/app/app.scss index 902622a0c..04e9a7c77 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -477,7 +477,22 @@ ion-app.app-root { margin-bottom: 0; } - .core-question-answer-correct, + + .core-question-answer-correct { + color: $core-question-correct-color; + } + + .core-question-answer-incorrect { + color: $core-question-incorrect-color; + } + + input, select { + &.core-question-answer-correct, &.core-question-answer-incorrect { + background-color: $gray-lighter; + color: $text-color; + } + } + .core-question-correct, .core-question-comment { color: $core-question-correct-color; @@ -494,7 +509,6 @@ ion-app.app-root { } } - .core-question-answer-incorrect, .core-question-incorrect { color: $core-question-incorrect-color; background-color: $core-question-incorrect-color-bg;