Skip to content

Commit 3c29dd1

Browse files
committed
change the layout of the part submit and feedback area
On wide screens, the "save answer" button and score display are to the left of the feedback messages, so the whole thing uses less vertical space. On narrow screens, the "save answer" button and score display are in a row above the feedback messages.
1 parent ac2dbdb commit 3c29dd1

2 files changed

Lines changed: 42 additions & 22 deletions

File tree

themes/default/files/resources/exam.css

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,29 +1141,43 @@ select.multiplechoice {
11411141

11421142
.part .submit-and-feedback {
11431143
margin: 1em 0;
1144-
display: flex;
1145-
flex-direction: column;
1146-
align-items: flex-end;
1144+
display: grid;
1145+
grid-template: "submit messages" auto "score messages" 1fr / 10em 1fr;
1146+
align-items: start;
1147+
gap: var(--spacing);
1148+
padding-top: 0.5em;
1149+
border-top: medium solid var(--main-colour);
1150+
}
1151+
1152+
.part .submitPart {
1153+
grid-area: submit;
11471154
}
11481155

11491156
.part .partFeedback {
1150-
margin-top: 1em;
1151-
text-align: right;
1152-
border-top: 2px solid var(--background-colour);
1153-
padding: 0.5em 0 0 2em;
1157+
grid-area: score;
1158+
}
1159+
1160+
.part .partFeedback .marks .score {
1161+
font-weight: bold;
1162+
}
1163+
1164+
.part .partFeedback .marks .feedback-icon {
1165+
margin-left: 0.5em;
11541166
}
11551167

11561168
.part.answered .partFeedback {
11571169
border-top-color: var(--main-colour);
11581170
}
11591171

11601172
.part .feedbackMessages {
1161-
margin-top: 1em;
1162-
clear: both;
1163-
overflow-y: auto;
1164-
background: none;
1165-
border-color: #a2d1f0;
1173+
clear: both;
1174+
overflow-y: auto;
1175+
background: none;
1176+
border-left: medium solid;
1177+
border-color: #a2d1f0;
11661178
border-color: var(--main-colour);
1179+
grid-area: messages;
1180+
padding-left: var(--spacing);
11671181
}
11681182
.part:not(.has-feedback-messages) .feedbackMessages {
11691183
visibility: hidden;
@@ -1174,7 +1188,6 @@ select.multiplechoice {
11741188
}
11751189

11761190
.part .feedbackMessages > summary {
1177-
text-align: end;
11781191
margin-bottom: var(--spacing);
11791192
cursor: pointer;
11801193
}
@@ -1202,8 +1215,9 @@ select.multiplechoice {
12021215

12031216
.part .feedbackMessage {
12041217
display: grid;
1205-
grid-template-columns: minmax(2em,90vw) auto;
1206-
justify-items: end;
1218+
grid-template-columns: auto 1fr;
1219+
justify-items: start;
1220+
gap: 0.5em;
12071221
}
12081222

12091223
.part .feedbackMessage .message {
@@ -1237,11 +1251,17 @@ select.multiplechoice {
12371251
width: 9em;
12381252
}
12391253

1240-
.part .marks {
1241-
text-align: right;
1242-
}
1243-
.part .marks .score {
1244-
font-weight: bold;
1254+
@media (max-width: 80em) {
1255+
.part .submit-and-feedback {
1256+
grid-template: "submit score" auto "messages messages" 1fr / auto 1fr;
1257+
justify-items: start;
1258+
}
1259+
1260+
.part .feedbackMessages {
1261+
width: 100%;
1262+
padding-left: 0;
1263+
border-left: none;
1264+
}
12451265
}
12461266

12471267
.next-parts {

themes/default/templates/xslt/part.xslt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@
6767
<p class="sr-only" data-bind="visible: isNotOnlyPart, text: feedback_title"></p>
6868
<ol data-bind="visible: shownFeedbackMessages().length, foreach: shownFeedbackMessages">
6969
<li class="feedbackMessage" data-bind="attr: {{'data-credit-change': credit_change}}">
70+
<span data-bind="visible: $parent.showFeedbackIcon, css: 'feedback-icon '+icon" aria-hidden="true"></span>
71+
7072
<span class="message">
7173
<xsl:comment>ko if: format=='html'</xsl:comment>
7274
<span data-bind="dom: message"></span>
@@ -81,8 +83,6 @@
8183
<span data-bind="dom: credit_message"></span>
8284
<xsl:comment>/ko</xsl:comment>
8385
</span>
84-
85-
<span data-bind="visible: $parent.showFeedbackIcon, css: 'feedback-icon '+icon" aria-hidden="true"></span>
8686
</li>
8787
</ol>
8888
</details>

0 commit comments

Comments
 (0)