modif button et css memory2

This commit is contained in:
DonRenando 2015-03-09 22:22:43 +01:00
parent 3ea7f8ae6e
commit 853ee062d9
4 changed files with 35 additions and 14 deletions

View File

@ -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: -o-linear-gradient(top, #4f85bb 0%,#4f85bb 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #4f85bb 0%,#4f85bb 100%); /* IE10+ */ background: -ms-linear-gradient(top, #4f85bb 0%,#4f85bb 100%); /* IE10+ */
background: linear-gradient(to bottom, #4f85bb 0%,#4f85bb 100%); /* W3C */ 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,
.btn-primary[disabled], .btn-primary[disabled],
@ -6262,4 +6262,4 @@ body,
label, label,
.checkbox label { .checkbox label {
font-weight: 300; font-weight: 300;
} }

View File

@ -1,15 +1,32 @@
/* ============================================================================= /* =============================================================================
RESET, BOX SIZING, & CLEARFIX RESET, BOX SIZING, & CLEARFIX
============================================================================= */ ============================================================================= */
#jeu{ /*#jeu{
height: 100%; height: 100%;
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 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, *::before,
*::after { *::after {
@ -40,14 +57,17 @@ img {
.wrapper { .wrapper {
margin: 0 auto; margin: 0 auto;
width: 100%; width: 100%;
min-width: 432px; /*min-width: 432px;*/
} }
/* container */ /* container */
/*
.container { .container {
margin: 0 auto; padding-top: 50px;*/
/* margin: 0 auto;
width: 96%; width: 96%;
max-width: 1128px; max-width: 1128px;*/
} }
/* ============================================================================= /* =============================================================================
@ -152,7 +172,7 @@ img {
.mg__contents { .mg__contents {
position: relative; position: relative;
padding-bottom: 50%; padding-bottom: 47%;
margin-left: -5px; margin-left: -5px;
margin-right: -5px; margin-right: -5px;
} }
@ -456,7 +476,7 @@ img {
} }
.mg__tile--outside { .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; background-color: #dcdee1;
box-shadow: 0 0 0 1px #787a80; box-shadow: 0 0 0 1px #787a80;
} }

View File

@ -13,7 +13,7 @@
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<!-- css jeu memory --> <!-- css jeu memory -->
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto+Slab"> <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto+Slab">
<link rel="stylesheet" href="/css/memory.css">
<!-- Fonts --> <!-- Fonts -->
<link href='//fonts.googleapis.com/css?family=Roboto:400,300' rel='stylesheet' type='text/css'> <link href='//fonts.googleapis.com/css?family=Roboto:400,300' rel='stylesheet' type='text/css'>

View File

@ -1,5 +1,7 @@
@extends('app') @extends('app')
<div id="jeux">
<link rel="stylesheet" href="/css/memory.css">
<div class="container">
<br> <br>
<center><h1>{{ $game }}</h1></center> <center><h1>{{ $game }}</h1></center>
@ -13,11 +15,11 @@
<!-- <center><img src="http://i.ytimg.com/vi/xiIO1zUXNVI/maxresdefault.jpg" width="60%"></center> --> <!-- <center><img src="http://i.ytimg.com/vi/xiIO1zUXNVI/maxresdefault.jpg" width="60%"></center> -->
<div class="container">
<div class="wrapper"> <div class="wrapper">
<div class="content"> <div class="content">
<div class="row"> <div class="row">
<div class="col-xs-8 col-sm-10 col-md-12"> <div class="col-xs-12 col-sm-10 col-md-12">
<div id="my-memory-game"></div> <div id="my-memory-game"></div>
</div> </div>
</div> </div>
@ -25,4 +27,3 @@
</div> </div>
</div><!-- /.content --> </div><!-- /.content -->
</div> </div>
</div>