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

Merge pull request #4030 from FinnStutzenstein/style_fixes 

Fixed style issues introduced with #4025
This commit is contained in:
Finn Stutzenstein 2018-11-22 10:19:34 +01:00 committed by GitHub
parent d8886eb08f 9f05929251
commit f91c756b14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/.prettierrc
View File

@ -4,7 +4,7 @@
"singleQuote": true, "singleQuote": true,
"useTabs": false, "useTabs": false,
"bracketSpacing": true, "bracketSpacing": true,
"htmlWhitespaceSensitivity": "strict", "htmlWhitespaceSensitivity": "css",
"semi": true, "semi": true,
"trailingComma": "none", "trailingComma": "none",
"arrowParens": "avoid" "arrowParens": "avoid"

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

@ -25,19 +25,21 @@
<div *ngIf="topic" class="topic-container on-transition-fade"> <div *ngIf="topic" class="topic-container on-transition-fade">
<div class="topic-title"> <div class="topic-title">
<h2 *ngIf="!editTopic">{{ topic.title }}</h2> <h2 *ngIf="editTopic">{{ topicForm.get('title').value }}</h2> <h2 *ngIf="!editTopic">{{ topic.title }}</h2>
<h2 *ngIf="editTopic">{{ topicForm.get('title').value }}</h2>
</div> </div>
<mat-card *ngIf="topic || editTopic" class="topic-text"> <mat-card *ngIf="topic || editTopic" class="topic-text">
<div> <div>
<span *ngIf="!editTopic"> <span *ngIf="!editTopic">
{{ topic.text }} <div *ngIf="topic.text === ''" class="missing" translate>No description provided.</div> {{ topic.text }}
<div *ngIf="topic.text === ''" class="missing" translate>No description provided.</div>
</span> </span>
</div> </div>
<div *ngIf="topic.attachments && topic.attachments.length > 0"> <div *ngIf="topic.attachments && topic.attachments.length > 0">
<h3> <h3>
<span translate>Attachments</span> <span>:</span> <span translate>Attachments</span>:
<!-- TODO: Mediafiles and attachments are not fully implemented --> <!-- TODO: Mediafiles and attachments are not fully implemented -->
</h3> </h3>
</div> </div>
@ -56,13 +58,11 @@
<mat-error *ngIf="topicForm.invalid" translate>A name is required</mat-error> <mat-error *ngIf="topicForm.invalid" translate>A name is required</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div> <div>
<mat-form-field> <mat-form-field>
<textarea matInput formControlName="text" placeholder="{{ 'Description ' | translate }}"></textarea> <textarea matInput formControlName="text" placeholder="{{ 'Description ' | translate }}"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<!-- TODO: Select Mediafiles as attachments here --> <!-- TODO: Select Mediafiles as attachments here -->
</form> </form>
</mat-card> </mat-card>