diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 9156fa5..5b75a08 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,33 +1,11 @@ -<<<<<<< HEAD - + postgresql true org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/ - $ProjectFileDir$ - - - mariadb - true - org.mariadb.jdbc.Driver - jdbc:mariadb://127.0.0.1:3306/hegreconfort -======= - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/chauffageproj - $ProjectFileDir$ - - - postgresql - true - org.postgresql.Driver - jdbc:postgresql://172.20.96.1:5432/chauffageproj ->>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f + jdbc:postgresql://172.20.96.1:5432/HegreEtConfort $ProjectFileDir$ diff --git a/assets/styles/css/login.css b/assets/styles/css/login.css index 2b86d9d..c8fb87d 100644 --- a/assets/styles/css/login.css +++ b/assets/styles/css/login.css @@ -1,67 +1,87 @@ body { - width: 1500px; - height: 1000px; - - background: linear-gradient(#A0C2C8, #A6CD9E); + background: url("../image/fond.png") center center / cover no-repeat; } .logo { position: absolute; - margin: -3% 0 0 1%; - height: 30%; + margin: 0.5% 0 0 43.5%; + height: 25%; } -.titre { /*pas fini*/ - margin: 4% 10% 0 25%; - font-weight: 50; - font-size: 450%; -} -.background { +.titre { position: absolute; - width: 50%; - height: 50%; - left: 25%; - top: 25%; - - background: rgba(36, 60, 64, 0.7); + color: white; + margin: 15% 0 0 38%; } -.logoEmail { +.logoProfile { position: absolute; - margin: 6.5% 0 0 31%; - height: 12%; - background: #243C40; + border-radius: 10%; + margin: 20% 0 0 36%; + height: 10%; } -.email { - position: absolute; - margin: 7% 0 0 37.5%; - width: 30%; - height: 9.5%; - background-color: #f0f0f0; -} - .logoPassword { position: absolute; - margin: 16.5% 0 0 31%; - height: 12%; - background: #243C40; + border-radius: 10%; + margin: 27% 0 0 36%; + height: 10%; +} +.profile { + position: absolute; + border-radius: 2%; + margin: 20% 0 0 42%; + width: 22%; + height: 5%; } .password { position: absolute; - margin: 17% 0 0 37.5%; - width: 30%; - height: 9.5%; - background-color: #f0f0f0; + border-radius: 2%; + margin: 27% 0 0 42%; + width: 22%; + height: 5%; } -/*forgot password*/ + .forgot { position: absolute; - margin: 23.5% 0 0 42.5%; - font-size: 130%; - color: #f0f0f0; + font-style: italic; + margin: 30% 0 0 52%; + font-size: 100%; + color: white; +} +#remember { + position: absolute; + margin: 33% 0 0 38%; + font-size: 100%; + color: white; +} +.remember { + position: absolute; + margin: 32.7% 0 0 39.5%; + font-size: 100%; + color: white; +} +.login { + position: absolute; + margin: 37.5% 0 0 36.6%; + width: 27%; + background-color: #243C40; + color: white; } +.background { + position: absolute; + box-shadow: 0 0 30px 1px black; + border-radius: 10%; + opacity: 85%; + + margin: 7% 0 0 35%; + width: 30%; + height: 75%; + + + background: #243C40; +} \ No newline at end of file diff --git a/assets/styles/image/fond.png b/assets/styles/image/fond.png new file mode 100644 index 0000000..fd4e838 Binary files /dev/null and b/assets/styles/image/fond.png differ diff --git a/assets/styles/image/2.png b/assets/styles/image/password.png similarity index 100% rename from assets/styles/image/2.png rename to assets/styles/image/password.png diff --git a/assets/styles/image/1.png b/assets/styles/image/profile.png similarity index 100% rename from assets/styles/image/1.png rename to assets/styles/image/profile.png diff --git a/templates/login/index.html.twig b/templates/login/index.html.twig index 08c8f2d..86898e2 100644 --- a/templates/login/index.html.twig +++ b/templates/login/index.html.twig @@ -2,30 +2,40 @@ - {% block title %}Authentification{% endblock %} - - - + Authentification + + + + + + + {% block stylesheets %} {% endblock %} +
+
+
-
-
-

D'HEGRE ET CONFORT

+ +

D'Hegre Et Confort

+ + Logo Profil + Logo Password + + + + +

Mot de passe oublié ?

+
- -
-
- - - - - - -
- -

Mot de passe oublié ?