From 180f4c1bf44823f746f837df3ba5d1d60d2297a6 Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Fri, 16 Mar 2018 12:46:39 +0100
Subject: [PATCH] fix administration css
---
.../maarch_entreprise/Views/administration.component.html | 8 ++++----
apps/maarch_entreprise/Views/menuNav.component.html | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/maarch_entreprise/Views/administration.component.html b/apps/maarch_entreprise/Views/administration.component.html
index 2c486fea12a..8aceccca806 100755
--- a/apps/maarch_entreprise/Views/administration.component.html
+++ b/apps/maarch_entreprise/Views/administration.component.html
@@ -25,7 +25,7 @@
font-weight: bolder;
opacity: 0.09;
text-align: center">ORGANISATION</div>
- <button style="white-space:inherit;height: 130px;" class="col-md-4 col-xs-6" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of organisationServices"
+ <button style="white-space:inherit;height: 130px;line-height:20px;" class="col-md-4 col-xs-6" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of organisationServices"
(click)="goToSpecifiedAdministration(modService)">
<i class="{{modService.style}} fa-4x"></i>
<br/>{{modService.name}}</button>
@@ -36,7 +36,7 @@
font-weight: bolder;
opacity: 0.09;
text-align: center">PRODUCTION</div>
- <button style="white-space:inherit;height: 130px;" class="col-md-4 col-xs-6" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of productionServices"
+ <button style="white-space:inherit;height: 130px;line-height:20px;" class="col-md-4 col-xs-6" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of productionServices"
(click)="goToSpecifiedAdministration(modService)">
<i class="{{modService.style}} fa-4x"></i>
<br/>{{modService.name}}</button>
@@ -46,7 +46,7 @@
font-weight: bolder;
opacity: 0.09;
text-align: center">CLASSEMENT</div>
- <button style="white-space:inherit;height: 130px;" class="col-md-4 col-xs-6" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of classementServices"
+ <button style="white-space:inherit;height: 130px;line-height:20px;" class="col-md-4 col-xs-6" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of classementServices"
(click)="goToSpecifiedAdministration(modService)">
<i class="{{modService.style}} fa-4x"></i>
<br/>{{modService.name}}</button>
@@ -57,7 +57,7 @@
font-weight: bolder;
opacity: 0.09;
text-align: center">SUPERVISION</div>
- <button style="white-space:inherit;height: 130px;" class="col-md-4 col-xs-6" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of supervisionServices"
+ <button style="white-space:inherit;height: 130px;line-height:20px;" class="col-md-4 col-xs-6" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of supervisionServices"
(click)="goToSpecifiedAdministration(modService)">
<i class="{{modService.style}} fa-4x"></i>
<br/>{{modService.name}}</button>
diff --git a/apps/maarch_entreprise/Views/menuNav.component.html b/apps/maarch_entreprise/Views/menuNav.component.html
index 87e9082db74..13cc038844f 100644
--- a/apps/maarch_entreprise/Views/menuNav.component.html
+++ b/apps/maarch_entreprise/Views/menuNav.component.html
@@ -6,7 +6,7 @@
{{lang.home}}
</p>
</a>
- <a mat-list-item routerLink="/administration">
+ <a mat-list-item routerLink="/administration" *ngIf="router.url != '/administration'">
<mat-icon color="primary" mat-list-icon class="fa fa-gears"></mat-icon>
<p mat-line>
{{lang.administration}}
--
GitLab