Skip to content
Snippets Groups Projects
Verified Commit c0ecb105 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

fix css with chrome

parent 982ffd44
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/frontend/app/profile/profile.component.html
+ 70
− 62
View file @ c0ecb105
...@@ -70,58 +70,64 @@ ...@@ -70,58 +70,64 @@
<mat-tab label="Préférences"> <mat-tab label="Préférences">
<div class="profile-content"> <div class="profile-content">
<div class="input-row"> <div class="input-row">
<fieldset style="display:flex;"> <fieldset>
<legend align="left">Mode de l'annotation</legend> <legend align="left">Mode de l'annotation</legend>
<div style="flex:1;"> <div class="form-container">
<mat-form-field> <div class="form-2-col">
<mat-select name="writingMode" [(ngModel)]="this.profileInfo.preferences.writingMode"> <mat-form-field>
<mat-option value="direct">Libre</mat-option> <mat-select name="writingMode" [(ngModel)]="this.profileInfo.preferences.writingMode">
<mat-option value="stylus">Stylet Apple <i class="fab fa-apple"></i></mat-option> <mat-option value="direct">Libre</mat-option>
</mat-select> <mat-option value="stylus">Stylet Apple <i class="fab fa-apple"></i></mat-option>
</mat-form-field> </mat-select>
</div> </mat-form-field>
<div *ngIf="this.profileInfo.preferences.writingMode == 'stylus'" style="flex:1;text-align: justify;font-size: 12px;"> </div>
Vous ne pourrez annoter les documents qu'avec le <b>stylet Apple</b>.<br /> <div *ngIf="this.profileInfo.preferences.writingMode == 'stylus'" class="form-2-col" style="text-align: justify;font-size: 12px;">
Cela a pour avantage de pouvoir poser la main sur la tablette sans perturber Vous ne pourrez annoter les documents qu'avec le <b>stylet Apple</b>.<br />
l'écriture. Cela a pour avantage de pouvoir poser la main sur la tablette sans perturber
</div> l'écriture.
<div *ngIf="this.profileInfo.preferences.writingMode == 'direct'" style="flex:1;text-align: justify;font-size: 12px;"> </div>
Mode standard, permettant l'annotation avec tout format (souris, main, stylets de <div *ngIf="this.profileInfo.preferences.writingMode == 'direct'" class="form-2-col" style="text-align: justify;font-size: 12px;">
toutes marques). Mode standard, permettant l'annotation avec tout format (souris, main, stylets de
toutes marques).
</div>
</div> </div>
</fieldset> </fieldset>
</div> </div>
<div class="input-row"> <div class="input-row">
<fieldset style="display:flex;"> <fieldset>
<legend align="left">Épaisseur du trait</legend> <legend align="left">Épaisseur du trait</legend>
<div style="flex:1"> <div class="form-container">
<mat-form-field> <div class="form-2-col">
<mat-select name="writingSize" [(ngModel)]="this.profileInfo.preferences.writingSize" <mat-form-field>
(selectionChange)="drawSample();"> <mat-select name="writingSize" [(ngModel)]="this.profileInfo.preferences.writingSize"
<mat-option *ngFor='let in of counter(10) ;let i = index' [value]="i+1">{{i+1}}</mat-option> (selectionChange)="drawSample();">
</mat-select> <mat-option *ngFor='let in of counter(10) ;let i = index' [value]="i+1">{{i+1}}</mat-option>
</mat-form-field> </mat-select>
</div> </mat-form-field>
<div style="flex:1"> </div>
<canvas id="sampleNote" width="150" height="150"></canvas> <div class="form-2-col">
<canvas id="sampleNote" width="150" height="150"></canvas>
</div>
</div> </div>
</fieldset> </fieldset>
</div> </div>
<div class="input-row"> <div class="input-row">
<fieldset style="display:flex;"> <fieldset style="display:table;">
<legend align="left">Couleur par défaut</legend> <legend align="left">Couleur par défaut</legend>
<div style="flex:1"> <div class="form-container">
<mat-form-field> <div class="form-2-col">
<mat-select name="writingColor" [(ngModel)]="this.profileInfo.preferences.writingColor"> <mat-form-field>
<mat-option style="color:#000000" value="#000000">Noir</mat-option> <mat-select name="writingColor" [(ngModel)]="this.profileInfo.preferences.writingColor">
<mat-option style="color:#1a75ff" value="#1a75ff">Bleu</mat-option> <mat-option style="color:#000000" value="#000000">Noir</mat-option>
<mat-option style="color:#FF0000" value="#FF0000">Rouge</mat-option> <mat-option style="color:#1a75ff" value="#1a75ff">Bleu</mat-option>
</mat-select> <mat-option style="color:#FF0000" value="#FF0000">Rouge</mat-option>
</mat-form-field> </mat-select>
</div> </mat-form-field>
<div style="flex:1"> </div>
<div style="height:50px;width:100px;margin:auto;" [style.backgroundColor]="this.profileInfo.preferences.writingColor"> <div class="form-2-col">
<div style="height:50px;width:100px;margin:auto;" [style.backgroundColor]="this.profileInfo.preferences.writingColor">
</div>
</div> </div>
</div> </div>
</fieldset> </fieldset>
...@@ -131,28 +137,30 @@ ...@@ -131,28 +137,30 @@
<mat-tab label="Administrations" *ngIf="signaturesService.userLogged.canManageRestUsers"> <mat-tab label="Administrations" *ngIf="signaturesService.userLogged.canManageRestUsers">
<div class="profile-content"> <div class="profile-content">
<div class="input-row"> <div class="input-row">
<fieldset style="display:flex;"> <fieldset>
<legend align="left">Utilisateurs Webservice</legend> <legend align="left">Utilisateurs Webservice</legend>
<div style="flex:2;"> <div class="form-container">
<mat-form-field> <div class="form-col" style="width:35%;">
<mat-select name="usersRest" [(ngModel)]="currentUserRest"> <mat-form-field>
<mat-option *ngFor="let userRest of usersRest" [value]="userRest">{{userRest.firstname}} <mat-select name="usersRest" [(ngModel)]="currentUserRest">
{{userRest.lastname}}</mat-option> <mat-option *ngFor="let userRest of usersRest" [value]="userRest">{{userRest.firstname}}
</mat-select> {{userRest.lastname}}</mat-option>
</mat-form-field> </mat-select>
</div> </mat-form-field>
<div style="flex:2;"> </div>
<mat-form-field class="input-row"> <div class="form-col" style="width:35%;">
<input name="newPasswordRest" matInput [(ngModel)]="currentUserRestPassword" <mat-form-field class="input-row">
placeholder="Nouveau mot de passe" [type]="hideNewPassword ? 'password' : 'text'" <input name="newPasswordRest" matInput [(ngModel)]="currentUserRestPassword"
(keyup)="checkPasswordValidity(currentUserRestPassword)"> placeholder="Nouveau mot de passe" [type]="hideNewPassword ? 'password' : 'text'"
<mat-icon matSuffix (click)="hideNewPassword = !hideNewPassword" class="fa fa-2x" (keyup)="checkPasswordValidity(currentUserRestPassword)">
[ngClass]="[hideNewPassword ? 'fa-eye-slash' : 'fa-eye']"></mat-icon> <mat-icon matSuffix (click)="hideNewPassword = !hideNewPassword" class="fa fa-2x"
<mat-hint style="color:red;">{{handlePassword.errorMsg}}</mat-hint> [ngClass]="[hideNewPassword ? 'fa-eye-slash' : 'fa-eye']"></mat-icon>
</mat-form-field> <mat-hint style="color:red;">{{handlePassword.errorMsg}}</mat-hint>
</div> </mat-form-field>
<div style="flex:1;"> </div>
<button mat-raised-button type="button" color="primary" [disabled]="handlePassword.error || currentUserRestPassword.length === 0" (click)="updateRestUser()" >Modifier</button> <div class="form-col" style="width:29%;">
<button mat-raised-button type="button" color="primary" [disabled]="handlePassword.error || currentUserRestPassword.length === 0" (click)="updateRestUser()" >Modifier</button>
</div>
</div> </div>
</fieldset> </fieldset>
</div> </div>
......
src/frontend/app/profile/profile.component.scss
+ 16
− 0
View file @ c0ecb105
...@@ -135,4 +135,20 @@ fieldset { ...@@ -135,4 +135,20 @@ fieldset {
legend { legend {
color: #F99830; color: #F99830;
}
.form-container {
display:table;
width:100%;
}
.form-2-col {
display:table-cell;
width:50%;
vertical-align:middle;
}
.form-col {
display:table-cell;
vertical-align:middle;
} }
\ No newline at end of file
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