Skip to content

Commit 7e52664

Browse files
committed
Merge branch 'develop'
2 parents 9171d77 + f38d4a0 commit 7e52664

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

src/app/graph-view/graph-view-page/graph-view-page.component.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,8 @@
2424

2525
.memberList li {
2626
direction: ltr;
27+
}
28+
29+
md-icon {
30+
font-size: 15px;
2731
}

src/app/graph-view/graph-view-page/graph-view-page.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
Help
1616
</mat-expansion-panel-header>
1717
<ul>
18-
<li><span style="font-weight: bold">🗨</span> selected / 🗨 deselected</li>
19-
<li><span style="color: green">🗨</span> rated positively / <span style="color: rgb(255, 0, 0)">🗨</span> rated negatively</li>
18+
<li><md-icon style="font-weight: bold">chat_bubble_outline</md-icon> selected / <md-icon>chat_bubble_outline</md-icon> deselected</li>
19+
<li><md-icon style="color: green">chat_bubble_outline</md-icon> rated positively / <md-icon style="color: rgb(255, 0, 0)">chat_bubble_outline</md-icon> rated negatively</li>
2020
<li><span style="font-weight: bold">>>></span> follow-up question</li>
2121
<li><span style="font-weight: bold">――</span> related question</li>
2222
</ul>
@@ -35,7 +35,7 @@
3535
</div>
3636
<div #below>
3737
<md-radio-group *ngIf="!subscriptionInProgress"
38-
fxLayout="row" fxLayoutGap="20px" [(ngModel)]="interactionMode">
38+
fxLayout="row" fxLayoutGap="20px" fxLayoutWrap [(ngModel)]="interactionMode">
3939
<md-radio-button color="primary" *ngFor="let m of getInteractionModes()" [value]="m">
4040
{{getInteractionModeLabel(m)}}
4141
</md-radio-button>

src/app/graph-view/graph-view-page/graph-view-page.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class GraphViewPageComponent implements OnInit, OnDestroy {
2525
private queryParamSubscription: Subscription;
2626
private spaceId = '1';
2727
private selectedQuestions;
28-
private spaceMembers = [];
28+
protected spaceMembers = [];
2929

3030
private adjustSize() {
3131
this.height = (window.innerHeight

src/app/graph-view/graph-view.module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {D3Service} from 'd3-ng2-service';
66
import {GraphViewPageComponent} from './graph-view-page/graph-view-page.component';
77
import {
88
MdButtonModule, MdDialogModule, MdFormFieldModule, MdInputModule, MdProgressSpinnerModule,
9-
MdRadioModule, MdSnackBarModule
9+
MdRadioModule, MdSnackBarModule, MdIconModule
1010
} from '@angular/material';
1111
import {FormsModule} from '@angular/forms';
1212
import {GraphViewService} from './graph-view/graph-view.service';
@@ -29,6 +29,7 @@ import {VoteDialogComponent} from './vote-dialog/vote-dialog.component';
2929
FormsModule,
3030
FlexLayoutModule,
3131
SharedModule,
32+
MdIconModule,
3233
MatExpansionModule
3334
],
3435
schemas: [CUSTOM_ELEMENTS_SCHEMA],

0 commit comments

Comments
 (0)