From d88c7ea5fb9ceffcbee9a8ffa9e360bd45f4d8e2 Mon Sep 17 00:00:00 2001 From: Sana EL HIRI Date: Mon, 7 Mar 2022 15:01:35 +0100 Subject: [PATCH] css modifs --- .../page-account/page-account.component.html | 2 +- .../page-account/page-account.component.scss | 8 ++++ .../page-accueil/page-accueil.component.html | 15 +++++-- .../page-accueil/page-accueil.component.scss | 42 ++++++++++++++++++- .../page-agenda/page-agenda.component.html | 25 +++++------ .../page-agenda/page-agenda.component.scss | 10 +++++ .../page-dashboard.component.html | 9 ++-- .../page-dashboard.component.scss | 15 +++++-- .../page-menu-semaine.component.html | 7 +--- .../page-menu-semaine.component.scss | 7 +++- .../page-repertoire.component.html | 4 +- .../page-repertoire.component.scss | 10 ++++- .../page-to-do-list.component.html | 9 ++-- .../page-to-do-list.component.scss | 14 +++++++ 14 files changed, 133 insertions(+), 44 deletions(-) diff --git a/src/app/pages/page-account/page-account.component.html b/src/app/pages/page-account/page-account.component.html index e0ad892..e87ebd6 100644 --- a/src/app/pages/page-account/page-account.component.html +++ b/src/app/pages/page-account/page-account.component.html @@ -3,7 +3,7 @@
-

{{ currentTeam.nom }}

+

{{ currentTeam.nom }}

diff --git a/src/app/pages/page-account/page-account.component.scss b/src/app/pages/page-account/page-account.component.scss index 6ebf7a9..73c778a 100644 --- a/src/app/pages/page-account/page-account.component.scss +++ b/src/app/pages/page-account/page-account.component.scss @@ -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; } diff --git a/src/app/pages/page-accueil/page-accueil.component.html b/src/app/pages/page-accueil/page-accueil.component.html index 738a91d..20f6467 100644 --- a/src/app/pages/page-accueil/page-accueil.component.html +++ b/src/app/pages/page-accueil/page-accueil.component.html @@ -1,4 +1,11 @@ - +
@@ -16,9 +23,9 @@ lu, nous sommes là pour vous aider !

- - - + + +
diff --git a/src/app/pages/page-accueil/page-accueil.component.scss b/src/app/pages/page-accueil/page-accueil.component.scss index 6df081c..c4bd40d 100644 --- a/src/app/pages/page-accueil/page-accueil.component.scss +++ b/src/app/pages/page-accueil/page-accueil.component.scss @@ -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; diff --git a/src/app/pages/page-agenda/page-agenda.component.html b/src/app/pages/page-agenda/page-agenda.component.html index af99f5f..216730d 100644 --- a/src/app/pages/page-agenda/page-agenda.component.html +++ b/src/app/pages/page-agenda/page-agenda.component.html @@ -1,12 +1,3 @@ - - - - - - + + +

Agenda

+
-
- -
- -
+
+ diff --git a/src/app/pages/page-agenda/page-agenda.component.scss b/src/app/pages/page-agenda/page-agenda.component.scss index 8a8fc2c..990f7b1 100644 --- a/src/app/pages/page-agenda/page-agenda.component.scss +++ b/src/app/pages/page-agenda/page-agenda.component.scss @@ -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; } diff --git a/src/app/pages/page-dashboard/page-dashboard.component.html b/src/app/pages/page-dashboard/page-dashboard.component.html index 1db4664..2f9892d 100644 --- a/src/app/pages/page-dashboard/page-dashboard.component.html +++ b/src/app/pages/page-dashboard/page-dashboard.component.html @@ -1,11 +1,10 @@ - - +
- +

Dashboard

-

Bienvenue {{ conectedUser.prenom }}!!

+

Bienvenue {{ conectedUser.prenom }}!

@@ -14,7 +13,7 @@
-
+
diff --git a/src/app/pages/page-dashboard/page-dashboard.component.scss b/src/app/pages/page-dashboard/page-dashboard.component.scss index ba266b3..3234c3a 100644 --- a/src/app/pages/page-dashboard/page-dashboard.component.scss +++ b/src/app/pages/page-dashboard/page-dashboard.component.scss @@ -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; -} \ No newline at end of file +} diff --git a/src/app/pages/page-menu-semaine/page-menu-semaine.component.html b/src/app/pages/page-menu-semaine/page-menu-semaine.component.html index 627a691..656a5cb 100644 --- a/src/app/pages/page-menu-semaine/page-menu-semaine.component.html +++ b/src/app/pages/page-menu-semaine/page-menu-semaine.component.html @@ -1,11 +1,8 @@ - + +

Menu de la semaine

-
- -
-

Menu de la semaine

diff --git a/src/app/pages/page-menu-semaine/page-menu-semaine.component.scss b/src/app/pages/page-menu-semaine/page-menu-semaine.component.scss index 8b13789..27199bc 100644 --- a/src/app/pages/page-menu-semaine/page-menu-semaine.component.scss +++ b/src/app/pages/page-menu-semaine/page-menu-semaine.component.scss @@ -1 +1,6 @@ - +.titre{ + color: #5d5fef; + font-size: 30px; + margin-left: 240px; + margin-top: 20px; +} diff --git a/src/app/pages/page-repertoire/page-repertoire.component.html b/src/app/pages/page-repertoire/page-repertoire.component.html index 6f48ea9..831e16d 100644 --- a/src/app/pages/page-repertoire/page-repertoire.component.html +++ b/src/app/pages/page-repertoire/page-repertoire.component.html @@ -4,11 +4,11 @@
- +

Répertoire