Skip to content

Commit a5f1d68

Browse files
breitybreity
committed
Updated some MultipleChoiceAuthoring styles and html; removed unnecessary global label style. #2875 
1 parent 285e6b6 commit a5f1d68

4 files changed

Lines changed: 108 additions & 125 deletions

File tree

‎src/main/webapp/site/src/messages.xlf‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6073,7 +6073,7 @@
60736073
</context-group>
60746074
<context-group purpose="location">
60756075
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6076-
<context context-type="linenumber">88</context>
6076+
<context context-type="linenumber">87</context>
60776077
</context-group>
60786078
</trans-unit>
60796079
<trans-unit datatype="html" id="3a12bd96093f8972cbd9d52a68fb9178aaee4388">
@@ -6084,7 +6084,7 @@
60846084
</context-group>
60856085
<context-group purpose="location">
60866086
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6087-
<context context-type="linenumber">100</context>
6087+
<context context-type="linenumber">99</context>
60886088
</context-group>
60896089
</trans-unit>
60906090
<trans-unit datatype="html" id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -6095,11 +6095,11 @@
60956095
</context-group>
60966096
<context-group purpose="location">
60976097
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6098-
<context context-type="linenumber">111</context>
6098+
<context context-type="linenumber">110</context>
60996099
</context-group>
61006100
<context-group purpose="location">
61016101
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6102-
<context context-type="linenumber">114</context>
6102+
<context context-type="linenumber">113</context>
61036103
</context-group>
61046104
</trans-unit>
61056105
<trans-unit datatype="html" id="2485299eb70909a6cfa961bfac54f062a220806c">
@@ -6131,46 +6131,39 @@
61316131
<source>Enter Prompt Here</source>
61326132
<context-group purpose="location">
61336133
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6134-
<context context-type="linenumber">7</context>
6134+
<context context-type="linenumber">6</context>
61356135
</context-group>
61366136
<context-group purpose="location">
61376137
<context context-type="sourcefile">../../wise5/components/openResponse/open-response-authoring/open-response-authoring.component.html</context>
61386138
<context context-type="linenumber">15</context>
61396139
</context-group>
61406140
</trans-unit>
6141-
<trans-unit datatype="html" id="bacc2af3229870ac6f929439bcc97d2386aa1771">
6142-
<source>Selection Type:</source>
6143-
<context-group purpose="location">
6144-
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6145-
<context context-type="linenumber">12</context>
6146-
</context-group>
6147-
</trans-unit>
6148-
<trans-unit datatype="html" id="0fe1d73a5f2339cbdb2675c4a2f846f3a1a54b20">
6141+
<trans-unit datatype="html" id="5ed696b8da9ac51f371a34f2a89a753b9e18e3c0">
61496142
<source> Single Answer </source>
61506143
<context-group purpose="location">
61516144
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6152-
<context context-type="linenumber">17</context>
6145+
<context context-type="linenumber">16</context>
61536146
</context-group>
61546147
</trans-unit>
6155-
<trans-unit datatype="html" id="f868401bea4712e4c7f4812f1816f634cf69c42b">
6148+
<trans-unit datatype="html" id="89573ba7e055d0f1cf66d9ac94bf5f47a7ada4b2">
61566149
<source> Multiple Answer </source>
61576150
<context-group purpose="location">
61586151
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6159-
<context context-type="linenumber">21</context>
6152+
<context context-type="linenumber">19</context>
61606153
</context-group>
61616154
</trans-unit>
61626155
<trans-unit datatype="html" id="51e09577ccc3a404bf3aa3bf88c6d5398135803b">
61636156
<source> There are no choices. Click the "Add Choice" button to add a choice. </source>
61646157
<context-group purpose="location">
61656158
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6166-
<context context-type="linenumber">38</context>
6159+
<context context-type="linenumber">37</context>
61676160
</context-group>
61686161
</trans-unit>
61696162
<trans-unit datatype="html" id="3f2b2b4a6ec318a31f7f5f9b526480846a27547a">
61706163
<source>Choice Text</source>
61716164
<context-group purpose="location">
61726165
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6173-
<context context-type="linenumber">45</context>
6166+
<context context-type="linenumber">44</context>
61746167
</context-group>
61756168
</trans-unit>
61766169
<trans-unit datatype="html" id="6b4a8fd4b52fd563b4963ab19f34658e069382d7">
@@ -6198,42 +6191,42 @@
61986191
<source> Is Correct </source>
61996192
<context-group purpose="location">
62006193
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6201-
<context context-type="linenumber">69</context>
6194+
<context context-type="linenumber">67</context>
62026195
</context-group>
62036196
</trans-unit>
62046197
<trans-unit datatype="html" id="4488359b3a14b99b193ac292e1f16ee47766ab8b">
62056198
<source>Is Correct</source>
62066199
<context-group purpose="location">
62076200
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6208-
<context context-type="linenumber">67</context>
6201+
<context context-type="linenumber">66</context>
62096202
</context-group>
62106203
</trans-unit>
62116204
<trans-unit datatype="html" id="e29c5e189e57e8d8dc3f52df4abe7bce4bfca53c">
62126205
<source>Feeback</source>
62136206
<context-group purpose="location">
62146207
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6215-
<context context-type="linenumber">76</context>
6208+
<context context-type="linenumber">74</context>
62166209
</context-group>
62176210
</trans-unit>
62186211
<trans-unit datatype="html" id="5317cde482fdb766008de3e1ae09cf0610366abc">
62196212
<source>Optional</source>
62206213
<context-group purpose="location">
62216214
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6222-
<context context-type="linenumber">80</context>
6215+
<context context-type="linenumber">79</context>
62236216
</context-group>
62246217
</trans-unit>
62256218
<trans-unit datatype="html" id="b7cd4598b947ef99d3603c8a026a57b821786785">
62266219
<source>Up</source>
62276220
<context-group purpose="location">
62286221
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6229-
<context context-type="linenumber">91</context>
6222+
<context context-type="linenumber">90</context>
62306223
</context-group>
62316224
</trans-unit>
62326225
<trans-unit datatype="html" id="c52c8626a9b546aa3859aa0a2e58221e27285cee">
62336226
<source>Down</source>
62346227
<context-group purpose="location">
62356228
<context context-type="sourcefile">../../wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html</context>
6236-
<context context-type="linenumber">103</context>
6229+
<context context-type="linenumber">102</context>
62376230
</context-group>
62386231
</trans-unit>
62396232
<trans-unit datatype="html" id="6817513ddcee06a7cb2a7b2708e5616b861db81c">

‎src/main/webapp/site/src/style/themes/_apps.scss‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,8 @@ $subhead-font-size-base: rem(1.600) !default;
6161
white-space: nowrap;
6262
}
6363

64-
// TODO: remove once bootstrap dependency is removed
6564
label {
66-
font-weight: 500 !important;
67-
display: inherit;
68-
max-width: none;
69-
margin-bottom: 0;
65+
font-weight: 500;
7066
}
7167

7268
.transform--none {

‎src/main/webapp/wise5/components/multipleChoice/multiple-choice-authoring/multiple-choice-authoring.component.html‎

Lines changed: 75 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,117 @@
1-
<mat-form-field class='prompt-input-container'>
1+
<mat-form-field>
22
<mat-label i18n>Prompt</mat-label>
3-
<textarea
4-
matInput
5-
[ngModel]='authoringComponentContent.prompt'
6-
(ngModelChange)='promptChanged($event)'
7-
placeholder='Enter Prompt Here'
3+
<textarea matInput
4+
[ngModel]="authoringComponentContent.prompt"
5+
(ngModelChange)="promptChanged($event)"
6+
placeholder="Enter Prompt Here"
87
i18n-placeholder
98
cdkTextareaAutosize>
109
</textarea>
1110
</mat-form-field>
12-
<p i18n>Selection Type:</p>
13-
<mat-radio-group
14-
class='selection-type-group'
15-
[(ngModel)]='authoringComponentContent.choiceType'
16-
(ngModelChange)='componentChanged()'>
17-
<mat-radio-button class='choice-radio-button' value='radio' i18n>
18-
Single Answer
19-
</mat-radio-button>
20-
<br/>
21-
<mat-radio-button class='choice-radio-button' value='checkbox' i18n>
22-
Multiple Answer
23-
</mat-radio-button>
24-
</mat-radio-group>
11+
<p>
12+
<label id="selection-type-label">Selection Type:</label>
13+
<mat-radio-group aria-labelledby="selection-type-label"
14+
[(ngModel)]="authoringComponentContent.choiceType"
15+
(ngModelChange)="componentChanged()">
16+
<mat-radio-button class="choice-radio-button" value="radio" i18n>
17+
Single Answer
18+
</mat-radio-button>
19+
<mat-radio-button class="choice-radio-button" value="checkbox" i18n>
20+
Multiple Answer
21+
</mat-radio-button>
22+
</mat-radio-group>
23+
</p>
2524
<button mat-raised-button
26-
color='primary'
27-
class='add-choice-button'
28-
(click)='addChoice()'
29-
matTooltip='Add Choice'
30-
matTooltipDirection='above'
25+
color="primary"
26+
class="add-choice-button"
27+
(click)="addChoice()"
3128
i18nMatTooltip
32-
aria-label='Add'
33-
i18n-aria-label>
29+
matTooltip="Add Choice"
30+
matTooltipDirection="above"
31+
i18n-aria-label
32+
aria-label="Add">
3433
<mat-icon>add</mat-icon>
3534
</button>
36-
<div *ngIf='authoringComponentContent.choices == null || authoringComponentContent.choices.length === 0'
37-
class='no-choices-message-container'
35+
<div *ngIf="authoringComponentContent.choices == null || authoringComponentContent.choices.length === 0"
36+
class="info-block"
3837
i18n>
3938
There are no choices. Click the "Add Choice" button to add a choice.
4039
</div>
41-
<div *ngFor='let choice of authoringComponentContent.choices; first as isFirst; last as isLast'
42-
class='choice-container'>
43-
<div fxLayout='row wrap' fxLayoutAlign='start center'>
44-
<mat-form-field class='choice-text-input-container'>
40+
<div *ngFor="let choice of authoringComponentContent.choices; first as isFirst; last as isLast"
41+
class="choice-container">
42+
<div fxLayout="row wrap" fxLayoutAlign="start center">
43+
<mat-form-field class="choice-text-input-container">
4544
<mat-label i18n>Choice Text</mat-label>
4645
<input matInput
47-
[(ngModel)]='choice.text'
48-
(ngModelChange)='choiceTextChange.next($event)'
49-
placeholder='Type text or choose an image'
50-
i18n-placeholder/>
46+
[(ngModel)]="choice.text"
47+
(ngModelChange)="choiceTextChange.next($event)"
48+
i18n-placeholder
49+
placeholder="Type text or choose an image" />
5150
</mat-form-field>
5251
<button mat-raised-button
53-
color='primary'
54-
class='choice-authoring-button'
55-
(click)='chooseChoiceAsset(choice)'
56-
matTooltip='Choose an Image'
57-
matTooltipDirection='above'
52+
color="primary"
53+
class="choice-authoring-button"
54+
(click)="chooseChoiceAsset(choice)"
5855
i18n-matTooltip
59-
aria-label='Image'
60-
i18n-aria-label>
56+
matTooltip="Choose an Image"
57+
matTooltipDirection="above"
58+
i18n-aria-label
59+
aria-label="Image">
6160
<mat-icon>insert_photo</mat-icon>
6261
</button>
6362
<div>
64-
<mat-checkbox
65-
[(ngModel)]='choice.isCorrect'
66-
(change)='feedbackChanged()'
67-
aria-label='Is Correct'
63+
<mat-checkbox [(ngModel)]="choice.isCorrect"
64+
(change)="feedbackChanged()"
6865
i18n-aria-label
66+
aria-label="Is Correct"
6967
i18n>
7068
Is Correct
7169
</mat-checkbox>
7270
</div>
7371
</div>
74-
<div fxLayout='row wrap' fxLayoutAlign='start center'>
75-
<mat-form-field class='choice-feedback-input-container'>
72+
<div fxLayout="row wrap" fxLayoutAlign="start center">
73+
<mat-form-field class="choice-feedback-input-container">
7674
<mat-label i18n>Feeback</mat-label>
7775
<input matInput
78-
[(ngModel)]='choice.feedback'
79-
(ngModelChange)='feedbackTextChange.next($event)'
80-
placeholder='Optional'
81-
i18n-placeholder/>
76+
[(ngModel)]="choice.feedback"
77+
(ngModelChange)="feedbackTextChange.next($event)"
78+
i18n-placeholder
79+
placeholder="Optional" />
8280
</mat-form-field>
8381
<button mat-raised-button
84-
color='primary'
85-
class='choice-authoring-button'
86-
[disabled]='isFirst'
87-
(click)='moveChoiceUp(choice.id)'
88-
matTooltip='Move Up'
89-
matTooltipDirection='above'
82+
color="primary"
83+
class="choice-authoring-button"
84+
[disabled]="isFirst"
85+
(click)="moveChoiceUp(choice.id)"
9086
i18n-matTooltip
91-
aria-label='Up'
92-
i18n-aria-label>
87+
matTooltip="Move Up"
88+
matTooltipDirection="above"
89+
i18n-aria-label
90+
aria-label="Up">
9391
<mat-icon>arrow_upward</mat-icon>
9492
</button>
9593
<button mat-raised-button
96-
color='primary'
97-
class='choice-authoring-button'
98-
[disabled]='isLast'
99-
(click)='moveChoiceDown(choice.id)'
100-
matTooltip='Move Down'
101-
matTooltipDirection='above'
94+
color="primary"
95+
class="choice-authoring-button"
96+
[disabled]="isLast"
97+
(click)="moveChoiceDown(choice.id)"
10298
i18n-matTooltip
103-
aria-label='Down'
104-
i18n-aria-label>
99+
matTooltip="Move Down"
100+
matTooltipDirection="above"
101+
i18n-aria-label
102+
aria-label="Down">
105103
<mat-icon>arrow_downward</mat-icon>
106104
</button>
107105
<button mat-raised-button
108-
color='primary'
109-
class='choice-authoring-button'
110-
(click)='deleteChoice(choice.id)'
111-
matTooltip='Delete'
112-
matTooltipDirection='above'
106+
color="primary"
107+
class="choice-authoring-button"
108+
(click)="deleteChoice(choice.id)"
113109
i18n-matTooltip
114-
aria-label='Delete'
115-
i18n-aria-label>
110+
matTooltip="Delete"
111+
matTooltipDirection="above"
112+
i18n-aria-label
113+
aria-label="Delete">
116114
<mat-icon>delete</mat-icon>
117115
</button>
118116
</div>
119-
</div>
117+
</div>

0 commit comments

Comments
 (0)