isa44.74/organizee-front
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge conflicts

Browse source
This commit is contained in:
AlineRinquin 2022-02-15 14:01:50 +01:00
commit 98374d8a47
30 changed files with 621 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/app/components/side-bar/side-bar.component.html
View file

@ -1,11 +1,29 @@
<nav class="custom-side-bar flex-shrink-0 bg-white border-end">
<div id="navbarNavAltMarkup">
<div class="navbar-nav">
<a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">Ma Team</a>
<a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">Répertoire</a>
<a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">To-Do-List</a>
<a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">Menus</a>
<a routerLink="../agenda" routerLinkActive="active-custom" class="nav-link">Agenda</a>
</div>
</div>
<nav class="wrapper">
<ul class="nav flex-column">
<li class="nav-item" ngbNavItem="maTeam" >
<a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">
<i class="bi bi-people-fill"></i>
Ma Team</a>
</li>
<li class="nav-item">
<a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">
<i class="bi bi-person-rolodex"></i>
Répertoire</a>
</li>
<li class="nav-item">
<a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">
<i class="bi bi-check2-square"></i>
To-Do-List</a>
</li>
<li class="nav-item">
<a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">
<i class='fas fa-pizza-slice'></i>
Menus</a>
</li>
<li class="nav-item">
<a routerLink="../agenda" routerLinkActive="active-custom" class="nav-link">
<i class="bi bi-calendar-event"></i>
Agenda</a>
</li>
</ul>
</nav>

24
src/app/components/side-bar/side-bar.component.scss
View file

@ -0,0 +1,24 @@
.wrapper {
display: flex;
flex-direction: row;
align-items: stretch;
width: auto;
height: 100%;
position: absolute;
background-color: rgb(238, 238, 238);
}
.nav{
margin-top: 20px;
align-items: left;
}
li {
margin-bottom: 5px;
}
a{
color: black;
font-weight: bold;
}