From 42fd966f9d85db2a71da0e28607a8602f40067b2 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Mon, 16 Jul 2018 14:44:51 +0200
Subject: [PATCH 1/2] #90 Tentative de correction
---
src/app/app.component.html | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 49b02bc71..95efefdc9 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,21 +1,13 @@
<header>
- <!--Navbar -->
- <nav class="navbar navbar-expand-sm navbar-dark indigo">
- <!-- Ouverture du sidenav -->
- <span style="font-size:30px;cursor:pointer;color:white" (click)="openNav()">☰</span>
+ <!--Navbar-->
+<mdb-navbar SideClass="navbar navbar-expand-lg navbar-dark indigo">
- <!-- lien vide pour que le toggler des liens apparaisse à droite -->
- <a class="navbar-brand"></a>
+ <!-- Navbar brand -->
+ <mdb-navbar-brand class="navbar-brand" (click)="openNav()">Cassiopée</mdb-navbar-brand>
- <!-- toggler des liens -->
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
- aria-expanded="false" aria-label="Toggle navigation">
- <!-- <span class="navbar-toggler-icon"> </span> -->
- <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
- </button>
-
- <!-- Collapsible content -->
- <div class="collapse navbar-collapse" id="navbarSupportedContent">
+ <!-- Collapsible content -->
+ <links>
+ <!-- Links -->
<ul class="navbar-nav mr-auto">
<li class="nav-item" *ngFor="let c of _calculators">
<a class="nav-link waves-light {{getHighlightClass(c.uid)}}" mdbRippleRadius [routerLink]="['/calculator/',c.uid]">{{c.title}}</a>
@@ -24,9 +16,12 @@
<i class="fa fa-plus-square fa-2x fa-inverse" style='vertical-align: middle' (click)='newCalc()'></i>
</li>
</ul>
- </div>
- </nav>
- <!--/Navbar -->
+ <!-- Links -->
+ </links>
+ <!-- Collapsible content -->
+
+</mdb-navbar>
+<!--/.Navbar-->
</header>
<main>
--
GitLab
From 7db895c023db669755b6d389175277bff004103f Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Mon, 16 Jul 2018 14:44:51 +0200
Subject: [PATCH 2/2] #90 Tentative de correction
---
src/app/app.component.html | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 363c0282d..78c8b0997 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,21 +1,13 @@
<header>
- <!--Navbar -->
- <nav class="navbar navbar-expand-sm navbar-dark indigo">
- <!-- Ouverture du sidenav -->
- <span style="font-size:30px;cursor:pointer;color:white" (click)="openNav()">☰</span>
+ <!--Navbar-->
+<mdb-navbar SideClass="navbar navbar-expand-lg navbar-dark indigo">
- <!-- lien vide pour que le toggler des liens apparaisse à droite -->
- <a class="navbar-brand"></a>
+ <!-- Navbar brand -->
+ <mdb-navbar-brand class="navbar-brand" (click)="openNav()">Cassiopée</mdb-navbar-brand>
- <!-- toggler des liens -->
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
- aria-expanded="false" aria-label="Toggle navigation">
- <!-- <span class="navbar-toggler-icon"> </span> -->
- <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
- </button>
-
- <!-- Collapsible content -->
- <div class="collapse navbar-collapse" id="navbarSupportedContent">
+ <!-- Collapsible content -->
+ <links>
+ <!-- Links -->
<ul class="navbar-nav mr-auto">
<li class="nav-item" *ngFor="let c of _calculators">
<a class="nav-link waves-light {{getHighlightClass(c.uid)}}" mdbRippleRadius [routerLink]="['/calculator/',c.uid]">{{c.title}}</a>
@@ -24,9 +16,12 @@
<i class="fa fa-plus-square fa-2x fa-inverse" style='vertical-align: middle' (click)='newCalc()'></i>
</li>
</ul>
- </div>
- </nav>
- <!--/Navbar -->
+ <!-- Links -->
+ </links>
+ <!-- Collapsible content -->
+
+</mdb-navbar>
+<!--/.Navbar-->
</header>
<main>
--
GitLab