ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4442 from MaximilianKrambach/zindex

Browse Source 
fix legalnotice and privacy z-index issue
This commit is contained in:
Emanuel Schütze 2019-03-07 15:40:32 +01:00 committed by GitHub
commit 6b7aaeac6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/app/shared/components/legal-notice-content/legal-notice-content.component.html
View File

@ -1,8 +1,8 @@
<mat-card class="os-card on-transition-fade"> <mat-card class="os-card">
<div> <div>
<div class='legal-notice-text' [innerHtml]='legalNotice'></div> <div class="legal-notice-text" [innerHtml]="legalNotice"></div>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<div *ngIf="versionInfo" class='version-text'> <div *ngIf="versionInfo" class="version-text">
<a [attr.href]="versionInfo.openslides_url" target="_blank"> <a [attr.href]="versionInfo.openslides_url" target="_blank">
OpenSlides {{ versionInfo.openslides_version }} OpenSlides {{ versionInfo.openslides_version }}
</a> </a>
@ -11,12 +11,8 @@
<div *ngIf="versionInfo.plugins.length"> <div *ngIf="versionInfo.plugins.length">
<p><span translate>Installed plugins</span>:</p> <p><span translate>Installed plugins</span>:</p>
<div *ngFor="let plugin of versionInfo.plugins"> <div *ngFor="let plugin of versionInfo.plugins">
<a [attr.href]="plugin.url" target="_blank"> <a [attr.href]="plugin.url" target="_blank"> {{ plugin.verbose_name }} {{ plugin.version }} </a>
{{ plugin.verbose_name }} {{ plugin.version }} <div *ngIf="plugin.license">(<span translate>License</span>: {{ plugin.license }})</div>
</a>
<div *ngIf="plugin.license">
(<span translate>License</span>: {{ plugin.license }})
</div>
</div> </div>
</div> </div>
</div> </div>

6
client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.html
View File

@ -1,6 +1,6 @@
<mat-card class='os-card on-transition-fade'> <mat-card class="os-card">
<div *ngIf='privacyPolicy' [innerHtml]='privacyPolicy'></div> <div *ngIf="privacyPolicy" [innerHtml]="privacyPolicy"></div>
<div *ngIf='!privacyPolicy' translate> <div *ngIf="!privacyPolicy" translate>
The event manager hasn't set up a privacy policy yet. The event manager hasn't set up a privacy policy yet.
</div> </div>
</mat-card> </mat-card>

2
client/src/app/site/agenda/components/topic-detail/topic-detail.component.html
View File

@ -24,7 +24,7 @@
</div> </div>
</os-head-bar> </os-head-bar>
<mat-card *ngIf="topic || editTopic" [ngClass]="editTopic ? 'os-form-card' : 'os-card'" class="on-transition-fade"> <mat-card *ngIf="topic || editTopic" [ngClass]="editTopic ? 'os-form-card' : 'os-card'">
<div *ngIf="!editTopic"> <div *ngIf="!editTopic">
<h1>{{ topic.getTitle() }}</h1> <h1>{{ topic.getTitle() }}</h1>
</div> </div>