Skip to content
Snippets Groups Projects
Commit 23376556 authored by David Noah Donges's avatar David Noah Donges
Browse files

Merge branch '22-participant-home-screen-html-template' into 'master'

Resolve "participant home screen - html template"

Closes #20 and #22

See merge request swtp-block-ws17/arsnova-angular-frontend!63
parents 67d6de46 c668c106
1 merge request!63Resolve "participant home screen - html template"
Pipeline #13110 passed with stage
in 33 seconds
<form> <form>
<mat-form-field class="input-block"> <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
<input matInput placeholder="Room-Id" /> <mat-form-field class="input-block">
</mat-form-field> <input matInput #roomId placeholder="Room-Id"/>
<button mat-raised-button color="primary">Join</button> </mat-form-field>
<button mat-fab color="primary" routerLink="room/{{ roomId.value }}">
<mat-icon>send</mat-icon>
</button>
</div>
</form> </form>
<app-join-room></app-join-room> <div fxLayout="column" fxLayoutAlign="start" fxLayoutGap="20px" fxFill>
<app-room-list></app-room-list> <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
<app-join-room></app-join-room>
</div>
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
<app-room-list></app-room-list>
</div>
</div>
app-join-room {
max-width: 800px;
}
app-room-list {
width: 100%;
max-width: 800px;
}
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
{{ room.description }} {{ room.description }}
</p> </p>
<mat-action-row> <mat-action-row>
<button mat-button routerLink="/room/{{ room.id }}">Join room</button> <button mat-button routerLink="room/{{ room.id }}">Join room</button>
</mat-action-row> </mat-action-row>
</mat-expansion-panel> </mat-expansion-panel>
</mat-accordion> </mat-accordion>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment