diff --git a/Dashboard.php b/Dashboard.php index 1199ce8..c88d662 100755 --- a/Dashboard.php +++ b/Dashboard.php @@ -14,7 +14,10 @@ if(!Authentification::checkUser(0)){ + + + @@ -23,9 +26,9 @@ if(!Authentification::checkUser(0)){ @@ -35,21 +38,7 @@ if(!Authentification::checkUser(0)){
- - - -
-
- -
- -
-
+
diff --git a/Docs/MedecinExemple.json b/Docs/MedecinExemple.json old mode 100644 new mode 100755 diff --git a/Docs/generateMedecin b/Docs/generateMedecin old mode 100644 new mode 100755 diff --git a/css/global.css b/css/global.css index ec8a2d4..1828c13 100755 --- a/css/global.css +++ b/css/global.css @@ -66,18 +66,6 @@ body{ background-color: #fafafa; } - -/* LOGO DANS LE MENU */ -#WRAPPER > #MENU > #ICON{ - /* position */ - position: relative; - width: 100%; - height: 100px; - - /* background */ - background-color: red; -} - /* LES LIENS DU MENU */ #WRAPPER > #MENU > a{ /* position */ @@ -98,7 +86,7 @@ body{ } /* :hover / .active */ -#WRAPPER > #MENU > a:hover, +#WRAPPER > #MENU > a:hover:not(#ICON), #WRAPPER > #MENU > a.active{ background-color: #efefef !important; color: #818181; @@ -116,8 +104,13 @@ body{ background-size: auto 1.5em; } -#WRAPPER > #MENU > a#doctor{ - background: url(../src/doctor.svg) left 1em center no-repeat; +#WRAPPER > #MENU > a#medecin{ + background: url(../src/medecin.svg) left 1em center no-repeat; + background-size: auto 1.3em; +} + +#WRAPPER > #MENU > a#patient{ + background: url(../src/patient.svg) left 1em center no-repeat; background-size: auto 1.5em; } @@ -129,6 +122,43 @@ body{ + +/* LOGO DANS LE MENU */ +#WRAPPER > #MENU > #ICON{ + /* position */ + position: relative; + width: 100%; + height: 100px; + padding: 0; + margin: 0; + + /* background */ + background: transparent url(../src/icon.svg) center center no-repeat; + background-size: auto 50%; + + /* animation */ + transition: all .5s ease-in-out; + -moz-transition: all .5s ease-in-out; + -webkit-transition: all .5s ease-in-out; + -ms-transition: all .5s ease-in-out; + -o-transition: all .5s ease-in-out; + + /* z axis */ + z-index: 100; +} + + +#WRAPPER > #MENU > #ICON:hover{ + animation: shake .5s infinite alternate; + -moz-animation: shake .5s infinite alternate; + -webkit-animation: shake .5s infinite alternate; + -ms-animation: shake .5s infinite alternate; + -o-animation: shake .5s infinite alternate; +} + + + + /*************/ /* CONTAINER */ /*************/ @@ -193,8 +223,9 @@ body{ /* position */ display: block; position: relative; - width: calc( 100% - 2*2em ); + width: calc( 100% - 2*2em - 2*1px ); margin: 2em; + margin-bottom: 4em; /* pour séparer les */ /* border */ border: 1px solid #f09108; @@ -238,7 +269,6 @@ body{ /* background */ background: #f6f4f2 url(../src/down-arrow.svg) right .5em center no-repeat; background-size: 1em auto; - /*