Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
arsnova-lite
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
24
Issues
24
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ARSnova
arsnova-lite
Commits
557e0c51
Commit
557e0c51
authored
Oct 03, 2019
by
Tom Käsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge
parent
c3643095
Pipeline
#31864
passed with stages
in 8 minutes and 56 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
25 deletions
+25
-25
src/app/components/creator/room-creator-page/room-creator-page.component.html
...reator/room-creator-page/room-creator-page.component.html
+22
-23
src/app/components/creator/room-creator-page/room-creator-page.component.scss
...reator/room-creator-page/room-creator-page.component.scss
+3
-2
No files found.
src/app/components/creator/room-creator-page/room-creator-page.component.html
View file @
557e0c51
...
...
@@ -36,7 +36,8 @@
{{ 'room-page.moderators' | translate}}
</button>
</mat-menu>
<button
id=
"settings-menu"
<div
fxLayout=
"column"
>
<button
id=
"settings-menu"
mat-icon-button
class=
"corner-icons"
[matMenuTriggerFor]=
"settingsMenu"
aria-labelledby=
"settings"
>
<mat-icon
class=
"corner-icon"
matTooltip=
"{{ 'room-page.session-settings' | translate}}"
>
settings
</mat-icon>
</button>
...
...
@@ -52,7 +53,6 @@
</p>
</mat-card-content>
<div
fxLayout=
"column"
fxLayoutAlign=
"center"
fxLayoutGap=
"20px"
>
<mat-grid-list
cols=
"{{viewModuleCount}}"
rowHeight=
"1:1"
*ngIf=
"viewModuleCount > 1"
>
<span
class=
"fill-remaining-space"
></span>
<mat-grid-list
cols=
"{{viewModuleCount}}"
rowHeight=
"2:1"
>
<mat-grid-tile>
...
...
@@ -61,7 +61,6 @@
<mat-icon
matBadge=
"{{commentCounter}}"
class=
"main-icon"
[ngClass]=
"{'desktop' : deviceType === 'desktop'}"
>
question_answer
</mat-icon>
<h2>
{{ 'room-page.comments' | translate}}
</h2>
<h3
*ngIf=
"deviceType === 'desktop'"
>
{{ 'room-page.comments' | translate}}
</h3>
</button>
</mat-grid-tile>
<mat-grid-tile
*ngIf=
"moderationEnabled"
>
...
...
@@ -76,31 +75,31 @@
</mat-grid-list>
<span
class=
"fill-remaining-space"
></span>
</div>
<div
fxLayout=
"
row
"
>
<div
fxLayout=
"
column"
fxLayoutAlign=
"center"
fxLayoutGap=
"20px
"
>
<span
class=
"fill-remaining-space"
></span>
<mat-grid-list
cols=
"
2
"
rowHeight=
"2:1"
class=
"second"
>
<mat-grid-list
cols=
"
3
"
rowHeight=
"2:1"
class=
"second"
>
<mat-grid-tile>
<button
mat-icon-button
routerLink=
"/creator/room/{{ room.shortId }}/feedback-barometer"
>
<mat-icon
class=
"smallerIcon"
[ngClass]=
"{'desktop' : deviceType === 'desktop'}"
>
thumbs_up_down
</mat-icon>
<h3
*ngIf=
"deviceType === 'desktop'"
>
{{ 'room-page.live-feedback' | translate}}
</h3>
</button>
</mat-grid-tile>
-->
</mat-grid-list>
<mat-grid-tile>
<button
mat-icon-button
routerLink=
"/creator/room/{{ room.shortId }}/create-content"
>
<mat-icon
class=
"main-icon"
[ngClass]=
"{'desktop' : deviceType === 'desktop'}"
>
note_add
</mat-icon>
<h3
*ngIf=
"deviceType === 'desktop'"
>
{{ 'room-page.create-content' | translate}}
</h3>
</button>
<button
mat-icon-button
routerLink=
"/creator/room/{{ room.shortId }}/statistics"
>
<mat-icon
class=
"main-icon"
[ngClass]=
"{'desktop' : deviceType === 'desktop'}"
>
insert_chart
</mat-icon>
<h3
*ngIf=
"deviceType === 'desktop'"
>
{{ 'room-page.answer-statistics' | translate}}
</h3>
</button>
</mat-grid-tile>
</mat-grid-list>
<mat-icon
class=
"smallerIcon"
[ngClass]=
"{'desktop' : deviceType === 'desktop'}"
>
thumbs_up_down
</mat-icon>
<h2>
{{ 'room-page.live-feedback' | translate}}
</h2>
</button>
</mat-grid-tile>
<mat-grid-tile>
<button
mat-icon-button
routerLink=
"/creator/room/{{ room.shortId }}/create-content"
>
<mat-icon
class=
"main-icon"
[ngClass]=
"{'desktop' : deviceType === 'desktop'}"
>
note_add
</mat-icon>
<h2>
{{ 'room-page.create-content' | translate}}
</h2>
</button>
</mat-grid-tile>
<mat-grid-tile>
<button
mat-icon-button
routerLink=
"/creator/room/{{ room.shortId }}/statistics"
>
<mat-icon
class=
"main-icon"
[ngClass]=
"{'desktop' : deviceType === 'desktop'}"
>
insert_chart
</mat-icon>
<h2>
{{ 'room-page.answer-statistics' | translate}}
</h2>
</button>
</mat-grid-tile>
</mat-grid-list>
<span
class=
"fill-remaining-space"
></span>
</div>
</div>
<app-content-groups
*ngIf=
"room && room.contentGroups"
[contentGroups]=
"room.contentGroups"
></app-content-groups>
</mat-card>
...
...
src/app/components/creator/room-creator-page/room-creator-page.component.scss
View file @
557e0c51
...
...
@@ -3,8 +3,8 @@
mat-card
{
width
:
100%
;
max-width
:
800px
;
min-height
:
3
50px
;
max-height
:
6
00px
;
min-height
:
6
50px
;
max-height
:
8
00px
;
background-color
:
var
(
--
surface
)
!
important
;
margin-top
:
7%
;
}
...
...
@@ -64,6 +64,7 @@ mat-card-content > :first-child {
mat-grid-list
{
margin-top
:
0
;
max-height
:
50%
!
important
;
margin-bottom
:
5px
!
important
;
}
.second
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment