Minager/minager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add design changes

Browse Source
This commit is contained in:
Florian THIERRY - Takiguchi
2018-09-30 13:07:57 +02:00
parent e40caf2b86
commit 2025208145
5 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/ts/src/app/app.component.html
View File

@@ -1,13 +1,12 @@
<app-header></app-header> <app-header></app-header>
<main class="container" *ngIf="!loading && connectedToApi"> <div id="versionDiv" *ngIf="!loading && connectedToApi">
<router-outlet></router-outlet> APP Version : {{appVersion}} - API Version : {{apiVersion}}
</main> </div>
<main class="container" *ngIf="!loading && !connectedToApi"> <main class="container">
<router-outlet *ngIf="!loading && connectedToApi"></router-outlet>
<div *ngIf="!loading && !connectedToApi">
<h3>Vous n'êtes pas connecté au serveur.</h3> <h3>Vous n'êtes pas connecté au serveur.</h3>
Veuillez contacter votre administrateur ou réessayer plus tard. Veuillez contacter votre administrateur ou réessayer plus tard.
</div>
<h3 *ngIf="loading">Chargement...</h3>
</main> </main>
<main class="container" *ngIf="loading">
<h3>Chargement...</h3>
</main>
<!-- <app-footer></app-footer> -->

14
src/main/ts/src/app/app.component.scss
View File

@@ -1,4 +1,14 @@
main { main {
margin-top: 84px; padding-top: 15px;
padding-top: 25px; flex:1 0 auto;
}
#versionDiv {
background-color: #388e3c;
color: white;
padding: 2px 10px;
margin-top: -6px;
font-size: 12px;
font-style: italic;
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
} }

1
src/main/ts/src/app/app.component.ts
View File

@@ -10,6 +10,7 @@ import { environment } from '../environments/environment';
export class AppComponent implements OnInit { export class AppComponent implements OnInit {
title = 'app'; title = 'app';
loading = true; loading = true;
appVersion = environment.appVersion;
apiVersion; apiVersion;
connectedToApi = false; connectedToApi = false;

1
src/main/ts/src/app/header/header.component.html
View File

@@ -24,4 +24,5 @@
</li> </li>
</ul> </ul>
</links> </links>
<div style="background-color: blue;">Test</div>
</mdb-navbar> </mdb-navbar>

15
src/main/ts/src/styles.scss
View File

@@ -1,4 +1,19 @@
/* 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 */
html {
height: 100%;
}
body {
// 64px for the header and 15px for a litle margin.
padding-top: 90px;
padding-bottom: 30px;
display: flex;
position: relative;
flex-direction: column;
justify-content:space-between;
min-height: 100%;
}
.btn-rounded { .btn-rounded {
border-radius: 10em; border-radius: 10em;
} }