Skip to content

Commit 5fe9329

Browse files
committed
Update styles and terminology
1 parent ef826c5 commit 5fe9329

5 files changed

Lines changed: 29 additions & 17 deletions

File tree

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
@if (components.length == 1) {
2-
<button mat-button aria-label="Assessment items to show" i18n-aria-label disabled i18n>
3-
1 assessment item
4-
</button>
5-
} @else if (components.length > 1) {
6-
<mat-form-field appearance="fill" class="component-select">
1+
<mat-form-field appearance="fill" class="component-select form-field-no-hint">
2+
@if (components.length == 1) {
3+
<mat-select disabled placeholder="1 item ({{ getComponentTypeLabel(components[0].type) }})">
4+
</mat-select>
5+
} @else if (components.length > 1) {
76
<mat-select
87
[(ngModel)]="selectedComponents"
98
(selectionChange)="updateSelectedComponents()"
@@ -12,13 +11,11 @@
1211
multiple
1312
>
1413
<mat-select-trigger>{{ selectedText }}</mat-select-trigger>
15-
<mat-optgroup label="Assessment items to show" i18n-label>
16-
@for (component of components; track component.id; let i = $index) {
17-
<mat-option [value]="component" color="primary">
18-
{{ i + 1 }}: {{ getComponentTypeLabel(component.type) }}
19-
</mat-option>
20-
}
21-
</mat-optgroup>
14+
@for (component of components; track component.id; let i = $index) {
15+
<mat-option [value]="component" color="primary">
16+
{{ i + 1 }}: {{ getComponentTypeLabel(component.type) }}
17+
</mat-option>
18+
}
2219
</mat-select>
23-
</mat-form-field>
24-
}
20+
}
21+
</mat-form-field>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@use '@angular/material' as mat;
2+
3+
.component-select {
4+
@include mat.form-field-overrides(
5+
(
6+
container-vertical-padding: 8px,
7+
container-height: 40px
8+
)
9+
);
10+
}

src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/filter-components/filter-components.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { ComponentContent } from '../../../../common/ComponentContent';
1010
@Component({
1111
imports: [CommonModule, FormsModule, MatButtonModule, MatFormFieldModule, MatSelectModule],
1212
selector: 'filter-components',
13+
styleUrls: ['./filter-components.component.scss'],
1314
templateUrl: './filter-components.component.html'
1415
})
1516
export class FilterComponentsComponent {

src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ <h2 class="content-head__item">
2424
</div>
2525
</button>
2626
</div>
27-
<div class="mat-elevation-z1 list-item component-select">
28-
<span i18n>Question: </span>
27+
<div class="flex gap-2 items-center flex-wrap mb-2 mx-2">
28+
<h3 class="mat-body-1" i18n>Class Responses</h3>
2929
<filter-components
3030
[components]="components"
3131
(componentsChange)="setVisibleComponents($event)"

src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ import { NodeClassResponsesComponent } from '../node-class-responses/node-class-
3636
.list-item {
3737
display: block;
3838
}
39+
40+
.mat-body-1 {
41+
margin: 0;
42+
}
3943
`
4044
],
4145
templateUrl: './node-grading.component.html'

0 commit comments

Comments
 (0)