From 65f3c95b24944a289ba7754399caae62ae0ec766 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Thu, 10 Dec 2015 09:04:08 +0100 Subject: [PATCH] Ajout theme @bluegreen + rectif et optim design/alignements/mise en page, etc --- Consultations.php | 30 +- Medecins.php | 15 +- css/blue-green.theme.css | 21 ++ css/global.css | 104 +++-- src/iconBall.svg | 544 --------------------------- src/save.svg | 121 ------ src/{ => svg}/checkbox.svg | 0 src/svg/checkbox@bluegreen.theme.svg | 50 +++ src/{ => svg}/consultation.svg | 0 src/{ => svg}/dashboard.svg | 0 src/{ => svg}/down-arrow.svg | 0 src/{ => svg}/home.svg | 0 src/{ => svg}/icon.svg | 0 src/{ => svg}/invalid.svg | 0 src/{ => svg}/medecin.svg | 0 src/{ => svg}/patient.svg | 0 src/{ => svg}/right-arrow.svg | 0 src/svg/save.svg | 49 +++ src/{ => svg}/title-gears.svg | 0 src/{ => svg}/validated.svg | 0 20 files changed, 216 insertions(+), 718 deletions(-) create mode 100644 css/blue-green.theme.css delete mode 100755 src/iconBall.svg delete mode 100755 src/save.svg rename src/{ => svg}/checkbox.svg (100%) create mode 100644 src/svg/checkbox@bluegreen.theme.svg rename src/{ => svg}/consultation.svg (100%) rename src/{ => svg}/dashboard.svg (100%) rename src/{ => svg}/down-arrow.svg (100%) rename src/{ => svg}/home.svg (100%) rename src/{ => svg}/icon.svg (100%) rename src/{ => svg}/invalid.svg (100%) rename src/{ => svg}/medecin.svg (100%) rename src/{ => svg}/patient.svg (100%) rename src/{ => svg}/right-arrow.svg (100%) create mode 100755 src/svg/save.svg rename src/{ => svg}/title-gears.svg (100%) rename src/{ => svg}/validated.svg (100%) diff --git a/Consultations.php b/Consultations.php index 933f0c2..08a1ed8 100755 --- a/Consultations.php +++ b/Consultations.php @@ -49,9 +49,9 @@ if(!Authentification::checkUser(0)){ /* SAISIR UN RENDEZ-VOUS */ /*************************************/ ?>
-
+
-
- ".$MEDECIN['Nom']." ".$MEDECIN['Prenom'].""; ?> Médecin traitant du patient. -
+
-
Date:   - - -
Heure: - - -
Durée: - - -
+ Date de la consultation
+ Heure de la consultation
+ Durée de la consultation
@@ -91,13 +84,12 @@ if(!Authentification::checkUser(0)){ /*************************************/ ?>
- - - - +
+
+
- Clé de contrôle invalide. + Clé de contrôle invalide.
diff --git a/Medecins.php b/Medecins.php index 6e333ec..6371e82 100644 --- a/Medecins.php +++ b/Medecins.php @@ -16,12 +16,13 @@ if(!Authentification::checkUser(0)){ + - +
@@ -51,11 +52,11 @@ if(!Authentification::checkUser(0)){

Création d'un nouveau médecin au centre


-
-
+
+

- +
@@ -68,9 +69,9 @@ if(!Authentification::checkUser(0)){ /*************************************/ ?>
- - - +
+
+
diff --git a/css/blue-green.theme.css b/css/blue-green.theme.css new file mode 100644 index 0000000..abb59ab --- /dev/null +++ b/css/blue-green.theme.css @@ -0,0 +1,21 @@ +body.theme-bluegreen #CONTAINER > article[data-title]{ + border-color: #24b993; +} + +body.theme-bluegreen #CONTAINER > article[data-title]:before{ + border-color: #24b993; + background-color: #24b993; +} + +body.theme-bluegreen #CONTAINER > article select.associated{ + border-color: #24b993; +} + +body.theme-bluegreen input[type=checkbox] + label:before{ + border-color: #24b993; +} + + +body.theme-bluegreen input[type=checkbox] + label:before{ + background-image: url(../src/svg/checkbox@bluegreen.theme.svg); +} \ No newline at end of file diff --git a/css/global.css b/css/global.css index abf1c21..8eaac56 100755 --- a/css/global.css +++ b/css/global.css @@ -78,7 +78,7 @@ body{ margin: 0; /* background */ - background: transparent url(../src/icon.svg) center center no-repeat; + background: transparent url(../src/svg/icon.svg) center center no-repeat; background-size: auto 50%; /* animation */ @@ -113,8 +113,8 @@ body{ height: calc( 100% - 100px ); /* flex properties */ - flex-direction: row; - justify-content: space-around; + flex-direction: column; + justify-content: flex-start; align-items: center; flex-wrap: wrap; @@ -125,6 +125,8 @@ body{ overflow: hidden; } +#WRAPPER{ height:500%; } + /* LES LIENS DU MENU */ #WRAPPER > #MENU > div > a{ @@ -134,6 +136,7 @@ body{ width: calc( 225px/1.6 - 2*1em ); height: calc( 225px/1.6 - 1em ); padding: 0 1em; + margin: 1em; /* border */ border-radius: 5px; @@ -178,22 +181,22 @@ body{ /* icones associées aux liens */ #WRAPPER > #MENU > div > a#consultations{ - background: url(../src/consultation.svg) center bottom 1em no-repeat; + background: url(../src/svg/consultation.svg) center bottom 1em no-repeat; background-size: 50% auto; } #WRAPPER > #MENU > div > a#medecin{ - background: url(../src/medecin.svg) center bottom 1em no-repeat; + background: url(../src/svg/medecin.svg) center bottom 1em no-repeat; background-size: 50% auto; } #WRAPPER > #MENU > div > a#patient{ - background: url(../src/patient.svg) center bottom 1em no-repeat; + background: url(../src/svg/patient.svg) center bottom 1em no-repeat; background-size: 50% auto; } #WRAPPER > #MENU > div > a#dashboard{ - background: url(../src/dashboard.svg) center bottom 1em no-repeat; + background: url(../src/svg/dashboard.svg) center bottom 1em no-repeat; background-size: 50% auto; } @@ -248,7 +251,7 @@ body{ width: 1em; height: .7em; - background: url(../src/right-arrow.svg) center center no-repeat; + background: url(../src/svg/right-arrow.svg) center center no-repeat; background-size: 40% auto; } @@ -256,7 +259,7 @@ body{ #WRAPPER > #CONTAINER > #BREADCRUMB a:first-child:before{ margin-right: 1em; height: 1em; - background-image: url(../src/home.svg); + background-image: url(../src/svg/home.svg); background-size: auto 100%; } @@ -293,7 +296,7 @@ body{ border: 1px solid #f09108; /* background */ - background: #f09108 url(../src/title-gears.svg) left .5em center no-repeat; + background: #f09108 url(../src/svg/title-gears.svg) left .5em center no-repeat; background-size: 1em auto; /* foreground */ @@ -314,7 +317,7 @@ body{ border: 1px solid #e5e5e5; /* background */ - background: #f6f4f2 url(../src/down-arrow.svg) right .5em center no-repeat; + background: #f6f4f2 url(../src/svg/down-arrow.svg) right .5em center no-repeat; background-size: 1em auto; /* [type=submit] */ #CONTAINER > article input[type=submit]{ /* position */ padding-left: 3em; /* background */ - background: #2a7ec7 url(../src/save.svg) center left 1em no-repeat; + background: white url(../src/svg/save.svg) center left 1em no-repeat; background-size: 1em auto; /* foreground */ - color: #fff; + color: #888; /* extra */ cursor: pointer; /* animation */ - transition: color .2s ease-in-out; - -moz-transition: color .2s ease-in-out; - -webkit-transition: color .2s ease-in-out; - -ms-transition: color .2s ease-in-out; - -o-transition: color .2s ease-in-out; + transition: all .2s ease-in-out; + -moz-transition: all .2s ease-in-out; + -webkit-transition: all .2s ease-in-out; + -ms-transition: all .2s ease-in-out; + -o-transition: all .2s ease-in-out; } /* @hover */ #CONTAINER > article input[type=submit]:hover{ - background-color: #2d85d2; + color: #000; + background-position: center left .75em; + background-size: 1.5em auto; +} + +/* @active */ +#CONTAINER > article input[type=submit]:active{ + /* animation */ + transform: scale(.95); + -moz-transform: scale(.95); + -webkit-transform: scale(.95); + -ms-transform: scale(.95); + -o-transform: scale(.95); } - /* CHECKBOX HACK */ -input[type=checkbox]{ display: none !important; } +input[type=radio]{ display: none !important; } + +input[type=radio] + label{ + display: inline-block; + margin-top: .5em; + margin-left: 1em; +} /* label */ -input[type=checkbox] + label:before{ +input[type=radio] + label:before{ content: ''; /* position */ display: inline-block; @@ -470,7 +517,7 @@ input[type=checkbox] + label:before{ border: 1px solid #f18624; /* background */ - background: url(../src/checkbox.svg) center center no-repeat; + background: url(../src/svg/checkbox.svg) center center no-repeat; background-size: 0% auto; /* animation */ @@ -492,7 +539,7 @@ input[type=checkbox] + label:before{ } /* @active + label */ -input[type=checkbox]:active + label:before{ +input[type=radio]:active + label:before{ transform: scale(.8); -moz-transform: scale(.8); -webkit-transform: scale(.8); @@ -508,7 +555,7 @@ input[type=checkbox]:active + label:before{ /* @checked + label */ -input[type=checkbox]:checked + label:before{ +input[type=radio]:checked + label:before{ /* background */ background-size: 50% auto; @@ -521,3 +568,6 @@ input[type=checkbox]:checked + label:before{ } + + + diff --git a/src/iconBall.svg b/src/iconBall.svg deleted file mode 100755 index 535ef1c..0000000 --- a/src/iconBall.svg +++ /dev/null @@ -1,544 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/save.svg b/src/save.svg deleted file mode 100755 index 116425b..0000000 --- a/src/save.svg +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/checkbox.svg b/src/svg/checkbox.svg similarity index 100% rename from src/checkbox.svg rename to src/svg/checkbox.svg diff --git a/src/svg/checkbox@bluegreen.theme.svg b/src/svg/checkbox@bluegreen.theme.svg new file mode 100644 index 0000000..b927b55 --- /dev/null +++ b/src/svg/checkbox@bluegreen.theme.svg @@ -0,0 +1,50 @@ + +image/svg+xml \ No newline at end of file diff --git a/src/consultation.svg b/src/svg/consultation.svg similarity index 100% rename from src/consultation.svg rename to src/svg/consultation.svg diff --git a/src/dashboard.svg b/src/svg/dashboard.svg similarity index 100% rename from src/dashboard.svg rename to src/svg/dashboard.svg diff --git a/src/down-arrow.svg b/src/svg/down-arrow.svg similarity index 100% rename from src/down-arrow.svg rename to src/svg/down-arrow.svg diff --git a/src/home.svg b/src/svg/home.svg similarity index 100% rename from src/home.svg rename to src/svg/home.svg diff --git a/src/icon.svg b/src/svg/icon.svg similarity index 100% rename from src/icon.svg rename to src/svg/icon.svg diff --git a/src/invalid.svg b/src/svg/invalid.svg similarity index 100% rename from src/invalid.svg rename to src/svg/invalid.svg diff --git a/src/medecin.svg b/src/svg/medecin.svg similarity index 100% rename from src/medecin.svg rename to src/svg/medecin.svg diff --git a/src/patient.svg b/src/svg/patient.svg similarity index 100% rename from src/patient.svg rename to src/svg/patient.svg diff --git a/src/right-arrow.svg b/src/svg/right-arrow.svg similarity index 100% rename from src/right-arrow.svg rename to src/svg/right-arrow.svg diff --git a/src/svg/save.svg b/src/svg/save.svg new file mode 100755 index 0000000..f177ef1 --- /dev/null +++ b/src/svg/save.svg @@ -0,0 +1,49 @@ + +image/svg+xml \ No newline at end of file diff --git a/src/title-gears.svg b/src/svg/title-gears.svg similarity index 100% rename from src/title-gears.svg rename to src/svg/title-gears.svg diff --git a/src/validated.svg b/src/svg/validated.svg similarity index 100% rename from src/validated.svg rename to src/svg/validated.svg