From ab7413332aaa557c2e8511a33e119594c5754a71 Mon Sep 17 00:00:00 2001 From: Jerome Morjon Date: Thu, 5 Mar 2015 20:41:36 +0100 Subject: [PATCH 1/5] correction taille img home ref --- SRC/resources/views/home.blade#OnDisk.php | 75 +++++++++++++++++++++++ SRC/resources/views/home.blade.php | 2 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100755 SRC/resources/views/home.blade#OnDisk.php diff --git a/SRC/resources/views/home.blade#OnDisk.php b/SRC/resources/views/home.blade#OnDisk.php new file mode 100755 index 0000000..6d37950 --- /dev/null +++ b/SRC/resources/views/home.blade#OnDisk.php @@ -0,0 +1,75 @@ +@extends('app') +@section('content') + + +
+
+ + + + +@if ($referent != []) + +@else + +blabla LOL + +@endif + + +
+@endsection diff --git a/SRC/resources/views/home.blade.php b/SRC/resources/views/home.blade.php index 6d37950..bbc097e 100755 --- a/SRC/resources/views/home.blade.php +++ b/SRC/resources/views/home.blade.php @@ -40,7 +40,7 @@
@endif
- {{ $ref -> name }}-Nom + {{ $ref -> name }}-Nom
{{$ref -> firstname}}, {{$ref -> lastname}}
@endforeach From d696bdb4b78167a687d57735c55b185e23880ac1 Mon Sep 17 00:00:00 2001 From: Jerome Morjon Date: Thu, 5 Mar 2015 20:42:23 +0100 Subject: [PATCH 2/5] re correction --- SRC/public/css/home.css | 1 + 1 file changed, 1 insertion(+) diff --git a/SRC/public/css/home.css b/SRC/public/css/home.css index b2e6557..af764b1 100755 --- a/SRC/public/css/home.css +++ b/SRC/public/css/home.css @@ -39,6 +39,7 @@ body { { border: 7px solid white; box-shadow: 0px 0px 3px black; + width: 250px; max-height : 250px; max-width : 250px; background: #ffffff; /* Old browsers */ From 67279e8265d631a21e45993279795133220fadbd Mon Sep 17 00:00:00 2001 From: Jerome Morjon Date: Thu, 5 Mar 2015 21:12:34 +0100 Subject: [PATCH 3/5] fixation du bug affichage bouton retour sur Login --- SRC/public/css/home.css | 9 ++++++--- SRC/resources/views/.DS_Store | Bin 10244 -> 10244 bytes SRC/resources/views/auth/login.blade.php | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SRC/public/css/home.css b/SRC/public/css/home.css index af764b1..3c7db9b 100755 --- a/SRC/public/css/home.css +++ b/SRC/public/css/home.css @@ -9,16 +9,19 @@ body { .back_home { background: white; - width : 10%; + width: 100px; padding : 1%; + margin-bottom: 20px; border-radius: 8px; border: 1px solid silver; } .back_home img { - width: 40%; - height: 40%; + float:left; + width: 20px; + height: 20px; + vertical-align:middle; } .divRecherche diff --git a/SRC/resources/views/.DS_Store b/SRC/resources/views/.DS_Store index b4fb9bfe2ecff3954a3c1aadb725b5ffbfc549a8..80d6be4eefb5fda89686e536cec374b7cf8d5ba6 100755 GIT binary patch delta 63 zcmV-F0Kor*P=rvBV*&ZGah3;>fDN+;2pkBLITNlFG&MIYATcmBeJmh*H#9RWAT>5O Vllv1pvmX)X4zmX!`UJ8S0|T1s6QlqD delta 99 zcmV-p0G$7XP=rvBV*&WFah3;>fDN+;2pk9j_>(&msxB9Mdp9#IATlyBeJmh*H#aaW zAT%>KeSHw22nZV~H9<{TaD9rRqok##r>MfjlP?z^0mZW&5$X=J1|a(cvmF>a0kb_8 F$N`&1A}as@ diff --git a/SRC/resources/views/auth/login.blade.php b/SRC/resources/views/auth/login.blade.php index 2a00961..0cae08e 100755 --- a/SRC/resources/views/auth/login.blade.php +++ b/SRC/resources/views/auth/login.blade.php @@ -5,7 +5,7 @@
- < Retour Retour + Retour < Retour
From 9d66bf0b914c136dee006410f83c64b127c0eefd Mon Sep 17 00:00:00 2001 From: Jerome Morjon Date: Thu, 5 Mar 2015 21:17:56 +0100 Subject: [PATCH 4/5] correction bouton add referent dans admin --- SRC/public/css/admin.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SRC/public/css/admin.css b/SRC/public/css/admin.css index 18726ea..17922ba 100755 --- a/SRC/public/css/admin.css +++ b/SRC/public/css/admin.css @@ -37,6 +37,6 @@ table tbody tr td /*corps du tableau */ .addRef { - position: fixed; - left : 70%; + position: absolute; + left : 80%; } \ No newline at end of file From a895bb66ee7e5c5293c67151399ceeb781ab9765 Mon Sep 17 00:00:00 2001 From: Jerome Morjon Date: Fri, 6 Mar 2015 10:51:13 +0100 Subject: [PATCH 5/5] maj css et icon --- SRC/public/css/game.css | 9 +++++++-- SRC/public/css/home.css | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/SRC/public/css/game.css b/SRC/public/css/game.css index 45805af..c3ad405 100755 --- a/SRC/public/css/game.css +++ b/SRC/public/css/game.css @@ -1,3 +1,8 @@ +html +{ + width:100%; +} + body { background-image:url("../pictures/homePic/fond.jpg"); @@ -8,6 +13,6 @@ body } .iconGame { - width: 10%; - height: 20%; + width: 105px; + height: 105px; } diff --git a/SRC/public/css/home.css b/SRC/public/css/home.css index 3c7db9b..742ebf9 100755 --- a/SRC/public/css/home.css +++ b/SRC/public/css/home.css @@ -1,3 +1,8 @@ +html +{ + width: 100%; +} + body { background-image:url("../pictures/homePic/fond.jpg"); background-attachment:fixed;