From 853ee062d9f1747af0116ec7737a772d4051e67c Mon Sep 17 00:00:00 2001 From: DonRenando Date: Mon, 9 Mar 2015 22:22:43 +0100 Subject: [PATCH] modif button et css memory2 --- SRC/public/css/app.css | 4 +-- SRC/public/css/memory.css | 34 +++++++++++++++---- SRC/resources/views/app.blade.php | 2 +- .../views/one_referent_game.blade.php | 9 ++--- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/SRC/public/css/app.css b/SRC/public/css/app.css index df0acf7..b970253 100755 --- a/SRC/public/css/app.css +++ b/SRC/public/css/app.css @@ -2858,7 +2858,7 @@ background: -webkit-linear-gradient(top, #4f85bb 0%,#4f85bb 100%); /* Chrome10+, background: -o-linear-gradient(top, #4f85bb 0%,#4f85bb 100%); /* Opera 11.10+ */ background: -ms-linear-gradient(top, #4f85bb 0%,#4f85bb 100%); /* IE10+ */ background: linear-gradient(to bottom, #4f85bb 0%,#4f85bb 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4f85bb', endColorstr='#4f85bb',GradientType=0 ); +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4f85bb', endColorstr='#4f85bb',GradientType=0 ); } .btn-primary.disabled, .btn-primary[disabled], @@ -6262,4 +6262,4 @@ body, label, .checkbox label { font-weight: 300; -} \ No newline at end of file +} diff --git a/SRC/public/css/memory.css b/SRC/public/css/memory.css index 093fd49..c567024 100644 --- a/SRC/public/css/memory.css +++ b/SRC/public/css/memory.css @@ -1,15 +1,32 @@ /* ============================================================================= RESET, BOX SIZING, & CLEARFIX ============================================================================= */ -#jeu{ +/*#jeu{ height: 100%; width: 100%; margin: 0; padding: 0; - text-align: center; + + background-image:url("../pictures/setting_picture/fond.jpg"); + background-attachment:fixed; + background-repeat:no-repeat; + background-position:100% 100%; + background-size:cover; + +}*/ + +body +{ +background-image:url("../pictures/setting_picture/fond.jpg"); + background-attachment:fixed; + background-repeat:no-repeat; + background-position:100% 100%; + background-size:cover; } + + *, *::before, *::after { @@ -40,14 +57,17 @@ img { .wrapper { margin: 0 auto; width: 100%; - min-width: 432px; + /*min-width: 432px;*/ } /* container */ +/* .container { - margin: 0 auto; + padding-top: 50px;*/ +/* margin: 0 auto; width: 96%; - max-width: 1128px; + max-width: 1128px;*/ + } /* ============================================================================= @@ -152,7 +172,7 @@ img { .mg__contents { position: relative; - padding-bottom: 50%; + padding-bottom: 47%; margin-left: -5px; margin-right: -5px; } @@ -456,7 +476,7 @@ img { } .mg__tile--outside { - background: url("../img/default/logo-bw.png") 50% 50% no-repeat; + background: url("/pictures/default/logo-bw.png") 50% 50% no-repeat; background-color: #dcdee1; box-shadow: 0 0 0 1px #787a80; } diff --git a/SRC/resources/views/app.blade.php b/SRC/resources/views/app.blade.php index 59c04ba..d0f4ff3 100755 --- a/SRC/resources/views/app.blade.php +++ b/SRC/resources/views/app.blade.php @@ -13,7 +13,7 @@ - + diff --git a/SRC/resources/views/one_referent_game.blade.php b/SRC/resources/views/one_referent_game.blade.php index b44df8a..65dc3f7 100755 --- a/SRC/resources/views/one_referent_game.blade.php +++ b/SRC/resources/views/one_referent_game.blade.php @@ -1,5 +1,7 @@ @extends('app') -
+ + +

{{ $game }}

@@ -13,11 +15,11 @@ -
+
-
+
@@ -25,4 +27,3 @@
-