Skip to content

Commit

Permalink
Merge branch 'MDL-83068-main' of https://github.com/sarjona/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
@junpataleta
junpataleta committed Sep 12, 2024
2 parents a5ee124 + 64b0c39 commit f416dc4
Show file tree
Hide file tree
Showing 8 changed files with 128 additions and 28 deletions.
2 changes: 1 addition & 1 deletion admin/tool/componentlibrary/hugo/site/data/fontawesomeicons.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/classes/output/icon_system_fontawesome.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,9 @@ public function get_core_icon_map() {
'core:i/filter' => 'fa-filter',
'core:i/flagged' => 'fa-flag',
'core:i/folder' => 'fa-folder',
'core:i/grade_correct' => 'fa-check-double text-success',
'core:i/grade_incorrect' => 'fa-xmark text-danger',
'core:i/grade_partiallycorrect' => 'fa-check text-warning',
'core:i/grade_correct' => 'fa-regular fa-circle-check text-success',
'core:i/grade_incorrect' => 'fa-regular fa-circle-xmark text-danger',
'core:i/grade_partiallycorrect' => 'fa-circle-half-stroke text-warning',
'core:i/grades' => 'fa-clipboard-check',
'core:i/grading' => 'fa-wand-magic-sparkles',
'core:i/gradingnotifications' => 'fa-regular fa-bell',
Expand Down
2 changes: 1 addition & 1 deletion pix/i/grade_correct.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pix/i/grade_incorrect.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pix/i/grade_partiallycorrect.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 45 additions & 7 deletions theme/boost/scss/moodle/modules.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1275,6 +1275,44 @@ img.userpicture {
border-radius: 0 0 3px 3px;
}

.qnbutton.correct .thispageholder {
border-color: $success;
}

.qnbutton.incorrect .thispageholder {
border-color: $danger;
}

.qnbutton.partiallycorrect .thispageholder {
border-color: $warning;
}

.qnbutton.correct,
.qnbutton.correct .trafficlight {
background-color: #dff4d8; /* light green */
}

.qnbutton.incorrect,
.qnbutton.incorrect .trafficlight {
background-color: #fdd; /* light red */
}

.qnbutton.partiallycorrect,
.qnbutton.partiallycorrect .trafficlight {
background-color: #fcefdc; /* light yellow */
}

.qnbutton.blocked,
.qnbutton.blocked .trafficlight,
.qnbutton.complete,
.qnbutton.complete .trafficlight,
.qnbutton.answersaved,
.qnbutton.answersaved .trafficlight,
.qnbutton.requiresgrading,
.qnbutton.requiresgrading .trafficlight {
background-color: $gray-300;
}

.qnbutton.notyetanswered .trafficlight,
.qnbutton.invalidanswer .trafficlight {
background-color: $card-bg;
Expand All @@ -1285,29 +1323,29 @@ img.userpicture {
}

.qnbutton.correct .trafficlight {
background-image: url([[pix:theme|mod/quiz/checkmark]]);
background-color: $success;
background-image: url([[pix:core|i/grade_correct]]);
color: $success;
}

.qnbutton.blocked .trafficlight {
background-image: url([[pix:core|t/locked]]);
background-color: $input-disabled-bg;
}

.qnbutton.notanswered .trafficlight,
.qnbutton.incorrect .trafficlight {
background-color: $danger;
background-image: url([[pix:core|i/grade_incorrect]]);
color: $danger;
}

.qnbutton.partiallycorrect .trafficlight {
background-image: url([[pix:theme|mod/quiz/whitecircle]]);
background-color: $warning;
background-image: url([[pix:core|i/grade_partiallycorrect]]);
color: $warning;
}

.qnbutton.complete .trafficlight,
.qnbutton.answersaved .trafficlight,
.qnbutton.requiresgrading .trafficlight {
background-color: $gray-600;
background-color: $gray-300;
}
}

Expand Down
45 changes: 38 additions & 7 deletions theme/boost/style/moodle.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34691,6 +34691,37 @@ img.userpicture {
margin-top: 20px;
border-radius: 0 0 3px 3px;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.correct .thispageholder {
border-color: #357a32;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.incorrect .thispageholder {
border-color: #ca3120;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.partiallycorrect .thispageholder {
border-color: #f0ad4e;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.correct,
.path-mod-quiz #mod_quiz_navblock .qnbutton.correct .trafficlight {
background-color: #dff4d8; /* light green */
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.incorrect,
.path-mod-quiz #mod_quiz_navblock .qnbutton.incorrect .trafficlight {
background-color: #fdd; /* light red */
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.partiallycorrect,
.path-mod-quiz #mod_quiz_navblock .qnbutton.partiallycorrect .trafficlight {
background-color: #fcefdc; /* light yellow */
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.blocked,
.path-mod-quiz #mod_quiz_navblock .qnbutton.blocked .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.complete,
.path-mod-quiz #mod_quiz_navblock .qnbutton.complete .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.answersaved,
.path-mod-quiz #mod_quiz_navblock .qnbutton.answersaved .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.requiresgrading,
.path-mod-quiz #mod_quiz_navblock .qnbutton.requiresgrading .trafficlight {
background-color: #dee2e6;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.notyetanswered .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.invalidanswer .trafficlight {
background-color: #fff;
Expand All @@ -34699,25 +34730,25 @@ img.userpicture {
background-image: url([[pix:theme|mod/quiz/warningtriangle]]);
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.correct .trafficlight {
background-image: url([[pix:theme|mod/quiz/checkmark]]);
background-color: #357a32;
background-image: url([[pix:core|i/grade_correct]]);
color: #357a32;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.blocked .trafficlight {
background-image: url([[pix:core|t/locked]]);
background-color: #e9ecef;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.notanswered .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.incorrect .trafficlight {
background-color: #ca3120;
background-image: url([[pix:core|i/grade_incorrect]]);
color: #ca3120;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.partiallycorrect .trafficlight {
background-image: url([[pix:theme|mod/quiz/whitecircle]]);
background-color: #f0ad4e;
background-image: url([[pix:core|i/grade_partiallycorrect]]);
color: #f0ad4e;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.complete .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.answersaved .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.requiresgrading .trafficlight {
background-color: #6a737b;
background-color: #dee2e6;
}

#page-mod-quiz-edit ul.slots li.section li.activity .instancemaxmarkcontainer form input {
Expand Down
45 changes: 38 additions & 7 deletions theme/classic/style/moodle.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34691,6 +34691,37 @@ img.userpicture {
margin-top: 20px;
border-radius: 0 0 3px 3px;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.correct .thispageholder {
border-color: #357a32;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.incorrect .thispageholder {
border-color: #ca3120;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.partiallycorrect .thispageholder {
border-color: #f0ad4e;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.correct,
.path-mod-quiz #mod_quiz_navblock .qnbutton.correct .trafficlight {
background-color: #dff4d8; /* light green */
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.incorrect,
.path-mod-quiz #mod_quiz_navblock .qnbutton.incorrect .trafficlight {
background-color: #fdd; /* light red */
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.partiallycorrect,
.path-mod-quiz #mod_quiz_navblock .qnbutton.partiallycorrect .trafficlight {
background-color: #fcefdc; /* light yellow */
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.blocked,
.path-mod-quiz #mod_quiz_navblock .qnbutton.blocked .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.complete,
.path-mod-quiz #mod_quiz_navblock .qnbutton.complete .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.answersaved,
.path-mod-quiz #mod_quiz_navblock .qnbutton.answersaved .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.requiresgrading,
.path-mod-quiz #mod_quiz_navblock .qnbutton.requiresgrading .trafficlight {
background-color: #dee2e6;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.notyetanswered .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.invalidanswer .trafficlight {
background-color: #fff;
Expand All @@ -34699,25 +34730,25 @@ img.userpicture {
background-image: url([[pix:theme|mod/quiz/warningtriangle]]);
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.correct .trafficlight {
background-image: url([[pix:theme|mod/quiz/checkmark]]);
background-color: #357a32;
background-image: url([[pix:core|i/grade_correct]]);
color: #357a32;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.blocked .trafficlight {
background-image: url([[pix:core|t/locked]]);
background-color: #e9ecef;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.notanswered .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.incorrect .trafficlight {
background-color: #ca3120;
background-image: url([[pix:core|i/grade_incorrect]]);
color: #ca3120;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.partiallycorrect .trafficlight {
background-image: url([[pix:theme|mod/quiz/whitecircle]]);
background-color: #f0ad4e;
background-image: url([[pix:core|i/grade_partiallycorrect]]);
color: #f0ad4e;
}
.path-mod-quiz #mod_quiz_navblock .qnbutton.complete .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.answersaved .trafficlight,
.path-mod-quiz #mod_quiz_navblock .qnbutton.requiresgrading .trafficlight {
background-color: #6a737b;
background-color: #dee2e6;
}

#page-mod-quiz-edit ul.slots li.section li.activity .instancemaxmarkcontainer form input {
Expand Down

0 comments on commit f416dc4

Please sign in to comment.