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

Merge pull request #93 from AlineRinquin/sana

Browse source 
css modifs
This commit is contained in:
AlineRinquin 2022-03-07 15:03:05 +01:00 • committed by GitHub
commit f7a657fddd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 133 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/pages/page-account/page-account.component.html
View file

@ -3,7 +3,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-9 offset-2" id="main">
<h1 class="col-md-auto">{{ currentTeam.nom }}</h1>
<h2 class="col-md-auto titre">{{ currentTeam.nom }}</h2>
<div class="contenu">
<!-- Pour récupérer le membre connecté-->
<div class="d-flex justify-content-center">

8
src/app/pages/page-account/page-account.component.scss
View file

@ -2,6 +2,14 @@ button{
margin-bottom: 5px;
}
.titre{
display: inline-flex;
margin-left: 20px;
text-align: center;
color: #5d5fef;
font-size: 30px;
}
#main{
margin-top: 20px;
}

15
src/app/pages/page-accueil/page-accueil.component.html
View file

@ -1,4 +1,11 @@
<app-header></app-header>
<nav class="navbar navbar-expand-lg navbar-light bg-light sticky-top shadow">
<div class="container-fluid">
<a class="navbar-brand" routerLink="/accueil">
<img id="img" src="../../../assets/images/logo-organizee.png" />
Organizee
</a>
</div>
</nav>
<body>
<div class="container">
<div class="bienvenue">
@ -16,9 +23,9 @@ lu, nous sommes là pour vous aider !</p>
</div>
</div>
<div class="pub">
<img src="../../../assets/images/menu.png" />
<img src="../../../assets/images/repertoire.png" />
<img src="../../../assets/images/todo.png" />
<img class="imgAcc" src="../../../assets/images/menu.png" />
<img class="imgAcc" src="../../../assets/images/repertoire.png" />
<img class="imgAcc" src="../../../assets/images/todo.png" />
</div>
</body>

42
src/app/pages/page-accueil/page-accueil.component.scss
View file

@ -1,3 +1,43 @@
/** Header accueil **/
#img {
height:45px;
}
.navbar{
height: auto;
padding-left: 20px;
padding-right: 20px;
}
.navbar-brand {
font-weight: bold;
font-size: 2rem;
color: #5d5fef;
}
a:visited {
color: #5d5fef;
}
a:focus {
border-bottom: 1px solid;
background: #a5a6f6;
}
a:hover {
color: #7879f1;
}
a:active {
color: #5d5fef;
}
.container-fluid{
width:90%;
}
/** Contenu de la page **/
.container {
display: flex;
}
@ -40,7 +80,7 @@ p {
justify-content: space-between;
}
img {
.imgAcc {
border: 1px solid #d3d3d3;
border-radius: 10px;
box-shadow: 6px 6px #d3d3d3;

25
src/app/pages/page-agenda/page-agenda.component.html
View file

@ -1,12 +1,3 @@
<app-header></app-header>
<app-side-bar [backgroundColor]="'#F178B6'"></app-side-bar>
<app-alert
*ngIf="isShow"
[alert]="alert"
(eventClose)="onClickCloseAlert()"
></app-alert>
<!-- <div
class="alert alert-{{ alert.type }}"
role="alert"
@ -25,13 +16,16 @@
<span aria-hidden="true">&times;</span>
</button>
</div> -->
<app-header></app-header>
<app-side-bar [backgroundColor]="'#F178B6'"></app-side-bar>
<h2 class="titre">Agenda</h2>
<app-alert
*ngIf="isShow"
[alert]="alert"
(eventClose)="onClickCloseAlert()"
></app-alert>
<div style="display: flex">
<div style="width: 150px">
<app-side-bar></app-side-bar>
</div>
<div style="width: 100%">
<div style="width: 100%" id="daypilot">
<div class="wrap">
<div class="left">
<daypilot-navigator
@ -90,3 +84,4 @@
</div>
</div>
</div>
<app-footer></app-footer>

10
src/app/pages/page-agenda/page-agenda.component.scss
View file

@ -1,8 +1,18 @@
.titre{
color: #5d5fef;
font-size: 30px;
margin-left: 240px;
margin-top: 20px;
}
.wrap {
display: flex;
margin: 10px;
}
#daypilot{
margin-left: 180px;
}
.left {
margin-right: 10px;
}

9
src/app/pages/page-dashboard/page-dashboard.component.html
View file

@ -1,11 +1,10 @@
<app-header></app-header>
<app-side-bar [backgroundColor]="'#c3c3e7'"></app-side-bar>
<app-side-bar [backgroundColor]="'#7879F1'"></app-side-bar>
<div class="container">
<div class="row p-1 col-12 ">
<h2 class="titre">Dashboard</h2>
<div class="row ">
<h3 class="titre">Bienvenue {{ conectedUser.prenom }}!!</h3>
<h3 >Bienvenue {{ conectedUser.prenom }}!</h3>
</div>
<div class="row col-12">
@ -14,7 +13,7 @@
<div class="d-flex justify-content-center w-100 my-2" id="boxThree">
<app-meteo></app-meteo>
</div>
<div class="d-flex justify-content-center w-100 my-2">
<div class="d-flex justify-content-center w-100 my-2">
<app-humeur></app-humeur>
</div>
</div>

15
src/app/pages/page-dashboard/page-dashboard.component.scss
View file

@ -2,7 +2,15 @@
display: inline-flex;
margin-left: 20px;
text-align: center;
font-weight: bold;
color: #5d5fef;
font-size: 30px;
}
h3{
display: inline-flex;
margin-left: 20px;
text-align: center;
font-size: 25px;
}
.meteo {
@ -11,9 +19,10 @@
}
.container {
margin-left:200px;
margin-left:200px;
margin-top: 20px;
}
.avatar{
margin:O;
}
}

7
src/app/pages/page-menu-semaine/page-menu-semaine.component.html
View file

@ -1,11 +1,8 @@
<app-header></app-header>
<app-side-bar [backgroundColor]="'#F7C02B'"></app-side-bar>
<h2 class="titre">Menu de la semaine</h2>
<div class="row">
<div class="col-md-auto">
<app-side-bar [backgroundColor]="'#F7C02B'"></app-side-bar>
</div>
<div class="col menu text-center">
<h2>Menu de la semaine</h2>
<main class="contenu-menu">
<app-card-menu></app-card-menu>
</main>

7
src/app/pages/page-menu-semaine/page-menu-semaine.component.scss
View file

@ -1 +1,6 @@
.titre{
color: #5d5fef;
font-size: 30px;
margin-left: 240px;
margin-top: 20px;
}

4
src/app/pages/page-repertoire/page-repertoire.component.html
View file

@ -4,11 +4,11 @@
<div class="col-md-auto">
<app-side-bar [backgroundColor]="'#5a1e63'"></app-side-bar>
</div>
<h2 class="titre">Répertoire</h2>
<div class="col compte text-center py-3">
<div>
<button
*ngIf="parent"
*ngIf="parent"
routerLink="/ajouter-contact"
class="btn btn-sm btn-rounded btn-secondary m-3"
>

10
src/app/pages/page-repertoire/page-repertoire.component.scss
View file

@ -1,3 +1,11 @@
.titre{
display: inline-flex;
margin-left: 20px;
color: #5d5fef;
font-size: 30px;
margin-left: 240px;
margin-top: 20px;
}
.btn-secondary {
color: #fff;
background-color: #5a1e63 !important;
@ -35,4 +43,4 @@
.pointer{
cursor: pointer;
}
}

9
src/app/pages/page-to-do-list/page-to-do-list.component.html
View file

@ -1,10 +1,8 @@
<app-header></app-header>
<div class="row">
<div class="col-md-auto">
<app-side-bar [backgroundColor]="'#4E9E7B'"></app-side-bar>
</div>
<app-side-bar [backgroundColor]="'#4E9E7B'"></app-side-bar>
<h2 class="titre">To-Do-List</h2>
<div class="row ">
<div class="col menu text-center">
<h2>To-Do-List</h2>
<div class="d-flex align-items-stretch"></div>
<input
type="text"
@ -13,7 +11,6 @@
[(ngModel)]="todoListTitle"
(keyup.enter)="addTodoByTeamId()"
/>
<div class="d-flex align-items-stretch">
<div class="custom-main container p-3">
<div class="row">

14
src/app/pages/page-to-do-list/page-to-do-list.component.scss
View file

@ -1,6 +1,20 @@
.titre{
margin-left: 20px;
color: #5d5fef;
font-size: 30px;
margin-left: 240px;
margin-top: 40px;
}
.btn {
margin-top: 1%;
margin-bottom: 1%;
color: black;
box-shadow: 5px 5px 5px gray;
}
.row{
margin-left: 20px;
justify-content: center;
}