Commit e7b14c8c authored by Janik Münzenberger's avatar Janik Münzenberger
Browse files

Fixed some styles

parent 043820a6
......@@ -10,9 +10,9 @@
<label for="email_receiver" class="col-sm-2 col-form-label">{{"EMAIL.RECEIVER" | translate}}:</label>
<div class="col-sm-10">
<select *ngIf="receivers" type="email" autocomplete="email" class="form-control" formControlName="email_receiver" id="email_receiver" placeholder="Receiver email" required>
<option *ngFor="let recv of receivers" [value]="recv.email">{{recv.name}}</option>
<option *ngFor="let recv of receivers" [value]="recv?.email">{{recv?.name}}</option>
</select>
<input *ngIf="!receivers || receivers.length == 0" type="email" autocomplete="email" class="form-control" formControlName="email_receiver" id="email_receiver" placeholder="Receiver email">
<input *ngIf="!receivers || receivers.length === 0" type="email" autocomplete="email" class="form-control" formControlName="email_receiver" id="email_receiver" placeholder="Receiver email">
</div>
</div>
<div class="form-group row">
......
......@@ -27,7 +27,9 @@
<button type="button" type="submit" class="btn btn-primary btn-lg">{{"ANALYSIS.ANALYSE" | translate}}</button>
</div>
</form>
<div class="col-md-8 alert alert-danger mx-auto" style="display: none;" #error>
{{"ANALYSIS.NO_RESULT" | translate}}
</div>
<div class="cover" #loader>
<div class="loader"></div>
<h3>{{"ANALYSIS.PROGRESS" | translate}}</h3>
......
......@@ -24,6 +24,7 @@ export class AnalyseComponent implements OnInit {
@ViewChild(NgForm) analysisForm:NgForm;
@ViewChild('image') image;
@ViewChild('loader') loader;
@ViewChild('error') error:ElementRef;
constructor(private pService: PlantService,
private aService: AnalysisService,
......@@ -69,6 +70,7 @@ export class AnalyseComponent implements OnInit {
})
.catch(err => {
this.stopAnalysis();
this.error.nativeElement.style.display = 'block';
console.error(err);
});
}
......
......@@ -81,7 +81,8 @@
"SELECT_IMAGE": "Foto auswählen / machen",
"TO_EMAIL": "Sende Ergbnis an meine Email",
"ANALYSE": "Analysieren",
"PROGRESS": "Ihr Foto wird analysiert. Bitte warten."
"PROGRESS": "Ihr Foto wird analysiert. Bitte warten.",
"NO_RESULT": "Tut uns leid, aber wir konnten kein Ergebnis für ihre Analyse erhalten. Bitte versuchen sie es später noch einmal",
},
"PROFILE": {
"INFORMATION": "Information",
......
......@@ -81,6 +81,7 @@
"SELECT_IMAGE": "Choose / Make a photo",
"TO_EMAIL": "Send the result to my email",
"ANALYSE": "Analyse",
"NO_RESULT": "Sorry we couldnt get a result for your image in time. Please try again later.",
"PROGRESS": "Your Analysis is progressing. Please wait."
},
"PROFILE": {
......
......@@ -28,6 +28,14 @@ body {
animation: spin 2s linear infinite;
}
.modal-dialog{
margin: 0 auto;
}
.modal {
padding: 0 !important;
}
/* Safari */
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }
......@@ -43,11 +51,11 @@ body {
}
@media screen and (max-width: 541px){
.agm-info-window-content{
width: 200px;
width: 12.5rem;
}
.mat-tab-body-content .mb-1{
width: 226px;
width: 14.125rem;
}
......@@ -59,22 +67,21 @@ body {
@media screen and (max-width: 375px){
.mat-tab-body-content .mb-1{
width: 187px;
width: 11.68rem;
}
}
@media screen and (max-width: 360px) {
.mat-tab-body-content .mb-1 {
width: 173px;
width: 10.8rem;
}
}
@media screen and (max-width: 320px){
.mat-tab-body-content .mb-1{
width: 133px;
font-size: 14px;
width: 8.3rem;
font-size: 1em;
}
......
Supports Markdown
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