Skip to content
Snippets Groups Projects
Commit 014cfd8c authored by Samuel Eickelberg's avatar Samuel Eickelberg
Browse files

Finally! fixed the stylesheet issue with the DCC templates header being under...

Finally! fixed the stylesheet issue with the DCC templates header being under the top navigation (no one noticed yet?)
parent 0949dc03
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,7 @@ export class AppComponent {
constructor(private translate: TranslateService) {
this.translate.setDefaultLang('en');
this.translate.addLangs(['de', 'en', 'fr', 'es', 'pt']);
this.translate.addLangs(['en', 'de', 'fr', 'es', 'pt']);
this.translate.use('en');
}
}
......@@ -10,6 +10,11 @@
<mat-icon>info</mat-icon>
</button>
</mat-toolbar>
<main>
<router-outlet></router-outlet>
</main>
<mat-sidenav-container class="sidenav-container">
<mat-sidenav-content>
<mat-toolbar></mat-toolbar>
<main>
<router-outlet></router-outlet>
</main>
</mat-sidenav-content>
</mat-sidenav-container>
\ No newline at end of file
......@@ -2,15 +2,10 @@
width: relative;
display: flex;
flex-direction: column;
flex: 2;
flex: 2;
min-height: relative;
}
.sidenav a:hover {
color: #d8d4d4;
background: hsl(240, 3%, 87%) ;
box-shadow: 2px 2px 5px rgba(5, 5, 5, 0.2);
}
.logo-top {
height: 70%;
}
......@@ -43,12 +38,13 @@ mat-toolbar.mat-primary {
color: rgb(0, 0, 0);
margin-left: 17px;
font-size: 10px;
line-height: 1.3;
line-height: 1.3;
}
.sidenav-container {
height: relative;
}
.list-container {
display: flex;
flex-direction: column;
......@@ -67,11 +63,9 @@ line-height: 1.3;
.menu-text {
margin-right: 10px;
font-size: 83%;
}
.main-menu-toggler {
background: none;
border: none;
cursor: pointer;
......@@ -79,7 +73,6 @@ line-height: 1.3;
.main-menu-toggler mat-icon {
display: flex;
fill: currentColor;
transition: transform 0.3s ease;
}
......@@ -116,12 +109,11 @@ line-height: 1.3;
}
.menu-text {
justify-content:left;
justify-content: left;
font-size: 14px; // Example font size
}
.arrow-icon {
justify-content:center;
justify-content: center;
font-size: 18px; // Example font size
}
......@@ -28,13 +28,11 @@
.mat-select-flag {
width:40px !important;
margin-left:10px;
// border: 2px solid blue;
}
.icon-flag{
font-size: 18px;
}
.custom-dropdown-panel {
// border: 1px solid red;
min-width: 165px !important;
}
......
import {HttpClient, HttpHeaders} from '@angular/common/http';
import {Injectable} from '@angular/core';
import {FormControl} from '@angular/forms';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { FormControl } from '@angular/forms';
import { CalibrationCertificateDto } from '../../generated/dcc/model/calibrationCertificateDto';
import { NGXLogger } from 'ngx-logger';
import dccExamples from "./examples";
@Injectable({
......@@ -14,7 +14,7 @@ export class DccService {
public exampleDccs = dccExamples;
constructor(private http: HttpClient, private logger: NGXLogger) {
constructor(private http: HttpClient) {
}
//ugly hack to solve https://github.com/angular/angular/issues/18586
......@@ -89,10 +89,8 @@ export class DccService {
}
}
catch (e: unknown) {
this.logger.trace("unmarshalCustomDate::Exception thrown: "+(e as Error).message);
}
return new FormControl(result);
}
}
......
......@@ -55,7 +55,7 @@ export class InitializationService {
langTextPair.id = '';
langTextPair.refIds = [];
langTextPair.refTypes = [];
langTextPair.lang = 'de';
langTextPair.lang = 'en';
langTextPair.text = '';
result.content.push(langTextPair);
return result;
......
import { HttpErrorResponse } from '@angular/common/http';
import { ErrorHandler, Injectable, NgZone } from '@angular/core';
import { NGXLogger } from 'ngx-logger';
import { ErrorService } from '../services/common/error/error.service';
@Injectable()
......
......@@ -20,7 +20,7 @@
"dcc.convention": "Konvention",
"dcc.coreData": "Basis-Daten",
"dcc.countryCode": "Ländercode",
"dcc.countryOfCalibration": "Land der Kalibreirung",
"dcc.countryOfCalibration": "Land der Kalibrierung",
"dcc.customer": "Kunde",
"dcc.data.addData": "Daten hinzufügen",
"dcc.data.byteData": "Binärdaten",
......
/* You can add global styles to this file, and also import other style files */
/* You can add global styles to this file, and also import other style files */
@import url("https://fonts.googleapis.com/icon?family=Material+Icons");
html,
body {
height: 100%;
overflow: hidden;
}
.nested-list {
......@@ -43,7 +44,7 @@ mat-divider {
}
}
mat-card.blue-card.cockpit{
mat-card.blue-card.cockpit {
margin: 15px 20px;
}
......@@ -92,16 +93,13 @@ mat-card.blue-card {
justify-content: center;
}
}
}
}
mat-card-content {
margin-top: 20px;
}
}
/* ------ Gui-Design-Inputs-----*/
.row {
display: flex;
......@@ -118,22 +116,23 @@ mat-card.blue-card {
.label-container-big {
min-width: 190px;
}
mat-form-field {
flex-grow: 1;
margin: 0;
margin-right: 120px;
}
#localised-string {
margin: 0;
}
.row-checkbox{
.row-checkbox {
margin-left: 120px;
}
.button-container,
.dummy-container {
min-width: 120px;
......@@ -155,7 +154,3 @@ mat-card.blue-card {
.custom-circle-button-sm {
transform:scale(0.9);
}
@import "./node_modules/bootstrap/scss/bootstrap";
@import "node_modules/ngx-bootstrap/datepicker/bs-datepicker";
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment