Skip to content
Snippets Groups Projects
Commit ca81d5f5 authored by Ruben Bimberg's avatar Ruben Bimberg :computer:
Browse files

Merge branch 'staging' into onboarding-tour-ngx-joyride

parents 02472adc 716c02ee
Branches
Tags
No related merge requests found
Showing
with 11 additions and 37 deletions
<h2 class="oldtypo-h2">{{ 'room-page.sure' | translate }}</h2>
<mat-divider></mat-divider>
<p class="oldtypo-p">{{reallyDeleteText}}</p>
<app-dialog-action-buttons
buttonsLabelSection="content"
......
......@@ -2,7 +2,7 @@
<h2 class="oldtypo-h2">{{'room-page.bonus-token-header' | translate }}</h2>
<h3 class="oldtypo-h3">&raquo;{{room.name}}&laquo;</h3>
<h3 class="oldtypo-h3">{{ 'room-page.session-id' | translate}}: {{ room.shortId }}</h3>
<mat-divider></mat-divider>
<div *ngIf="bonusTokens.length >= 1">
<div fxLayout="row" *ngFor="let bonusToken of bonusTokens; index as i" class="tokens">
<p tabindex="0">
......
<div mat-dialog-content>
<!--questions-->
<h2 class="oldtypo-h2">{{'room-page.comments' | translate }}</h2>
<mat-divider></mat-divider>
<div fxLayout="column">
......@@ -50,7 +50,7 @@
</div>
</div>
<mat-divider></mat-divider>
<div fxLayoutAlign="center center">
<button mat-raised-button
......
......@@ -24,12 +24,6 @@ mat-icon {
margin-right: 10px;
}
mat-divider {
margin-bottom: 10px;
color: var(--on-surface) !important;
}
.abort {
background-color: var(--cancel);
color: var(--on-cancel);
......
<h3>{{ 'room-page.sure' | translate }}</h3>
<mat-divider></mat-divider>
<p>{{ 'comment-page.really-delete-answer' | translate }}</p>
<app-dialog-action-buttons
buttonsLabelSection="content"
......
<h3>{{ 'room-page.sure' | translate }}</h3>
<mat-divider></mat-divider>
<p>{{ 'comment-list.really-delete' | translate }}</p>
<app-dialog-action-buttons
buttonsLabelSection="content"
......
<h2 *ngIf="!bonusQuestions">{{ 'room-page.sure' | translate }}</h2>
<h2 *ngIf="bonusQuestions">{{ 'room-page.delete-comments-alt-header' | translate }}</h2>
<mat-divider></mat-divider>
<p *ngIf="!bonusQuestions">{{ 'room-page.really-delete-comments' | translate }}</p>
<p *ngIf="bonusQuestions">{{ 'room-page.really-delete-comments-hint' | translate }}</p>
<app-dialog-action-buttons *ngIf="!bonusQuestions"
......
<!--Are you sure-->
<h2 class="oldtypo-h2">{{ 'room-page.sure' | translate }}</h2>
<mat-divider></mat-divider>
<!--remove moderator-->
<p class="oldtypo-p">{{ 'room-page.really-remove-moderator' | translate }}</p>
<!--list of moderators-->
......
<div mat-dialog-content>
<h2 class="oldtypo-h2">{{'room-page.moderators' | translate }}</h2>
<mat-divider></mat-divider>
<div fxLayout="row">
<mat-form-field class="input-block">
<input (focus)="eventService.makeFocusOnInputTrue()"
......
......@@ -6,10 +6,6 @@ p {
font-size: medium;
}
mat-divider {
margin-bottom: 10px;
}
mat-form-field {
width: 90%;
color: var(--on-surface);
......
<h2>{{ 'room-page.sure' | translate }}</h2>
<mat-divider></mat-divider>
<p>{{ 'room-page.reallySession' | translate}}<strong>&raquo;{{room.name}}&laquo;</strong>{{ 'room-page.really2' | translate}}</p>
<app-dialog-action-buttons
buttonsLabelSection="room-page"
......
......@@ -2,7 +2,7 @@
*ngIf="editRoom">
<!--Sitzung-->
<h2 class="oldtypo-h2">{{ 'room-page.general' | translate }}</h2>
<mat-divider></mat-divider>
<div fxLayout="column">
<mat-form-field class="input-block">
<input (focus)="eventService.makeFocusOnInputTrue()"
......
......@@ -24,11 +24,6 @@ mat-icon {
margin-right: 10px;
}
mat-divider {
margin-bottom: 10px;
color: var(--on-surface) !important;
}
.abort {
background-color: var(--cancel);
color: var(--on-cancel);
......
<div mat-dialog-content>
<!--Tags-->
<h2 class="oldtypo-h2">{{'room-page.tags' | translate }}</h2>
<mat-divider></mat-divider>
<div fxLayout="column">
<div fxLayout="row">
<mat-form-field class="input-block">
......
mat-divider {
margin-bottom: 10px;
color: var(--on-surface) !important;
}
h2 {
margin-bottom: 10px;
}
......
......@@ -13,7 +13,7 @@
</button>
</div>
<mat-divider></mat-divider>
<mat-dialog-content tabindex="-1">
......
......@@ -4,7 +4,7 @@
mat-dialog-title
class="modal oldtypo-h2">{{ 'data-protection.title' | translate }}</h2>
<mat-divider></mat-divider>
<mat-dialog-content tabindex="0">
<app-data-protection-en *ngIf="currentLang=='en'"></app-data-protection-en>
......
......@@ -10,7 +10,7 @@
</div>
<!--frag.jetzt-->
<h1 tabindex="0" class="modal oldtypo-h2" mat-dialog-title>{{ 'introduction.title' | translate }}</h1>
<mat-divider></mat-divider>
<mat-dialog-content>
<div id="setFocus" class="intro-text" tabindex="-1">
<app-demo-en *ngIf="currentLang=='en'"></app-demo-en>
......
......@@ -2,7 +2,7 @@
<h1 tabindex="0"
mat-dialog-title>{{ 'imprint.title' | translate }} </h1>
<mat-divider></mat-divider>
<mat-dialog-content tabindex="0">
<app-imprint-en *ngIf="currentLang=='en'"></app-imprint-en>
......
......@@ -21,7 +21,7 @@
</button>
</form>
<mat-divider></mat-divider>
<div fxLayout="column" class="textfields">
<!--set new password-->
......
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