1
0
mirror of https://github.com/exane/not-gwent-online synced 2024-12-23 21:03:14 +00:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
exane 2015-06-23 15:01:49 +02:00
commit e88ba3a005
5 changed files with 73 additions and 16 deletions

View File

@ -13,6 +13,7 @@
<form class="form-session">
<input type="text" placeholder="Username" class="field-session" autofocus>
<input type="text" placeholder="E-Mail" class="field-session">
<input type="password" placeholder="Password" class="field-session">
<div class="wrap-btn-action btn-register-action">

View File

@ -3,45 +3,56 @@
float: left;
border-radius: 12px;
position: relative;
z-index: 10;;
z-index: 10;
top: 5px;
left: 5px;
}
.bla {
padding: 4px;
float: left;
border-radius: 14px;
margin: 100px;
position: relative;
width: 100%;
height: 100%;
position: absolute;
opacity: 0;
}
.card-wrap:hover .bla {
box-shadow: 0 0 2px 0 orange;
opacity: 1;
}
.shadow {
border-radius: 35%;
box-shadow: 0 0 15px 14px #ffa500;
content: "";
height: calc(100% - 40px);
left: 10px;
height: calc(100% - 50px);
left: 15px;
position: absolute;
width: calc(100% - 20px);
width: calc(100% - 22px);
z-index: 1;
top: 20px;
top: 30px;
transition: all 0.3s ease-in-out 0s;
opacity: 0;
}
.card-wrap:hover .shadow {
-webkit-animation: Shadow 4s ease-in-out infinite;
-moz-animation: Shadow 4s ease-in-out infinite;
animation: Shadow 4s ease-in-out infinite;
}
.ani {
background: linear-gradient(2deg, #000, #000, #000, #000);;
transition: all .05s ease-in-out 0s;
}
.card-wrap .ani {
background: linear-gradient(2deg, #ffa500, #ffd68b, #ffa500, #ffa500);
background-size: 800% 800%;
-webkit-animation: AnimationName 3s ease infinite;
-moz-animation: AnimationName 3s ease infinite;
animation: AnimationName 3s ease infinite;
}
@-webkit-keyframes Shadow {
@ -96,14 +107,21 @@
}
.overlay-card {
background: linear-gradient(2deg, rgba(255,255,255,.05), rgba(255,255,255,.3), rgba(255,255,255,.1));
background: linear-gradient(2deg, rgba(255,255,255,.03), rgba(255,255,255,.2), rgba(255,255,255,.05));
background-size: 800% 800%;
position: absolute;
z-index: 20;
width: calc(100% - 5px);
top: 10px;
left: 10px;
width: calc(100% - 10px);
height: calc(100% - 5px);
border-radius: 12px;
opacity: 0;
cursor: pointer;
}
.card-wrap:hover .overlay-card {
opacity: 1;
-webkit-animation: AnimationName 10s ease infinite;
-moz-animation: AnimationName 10s ease infinite;
animation: AnimationName 10s ease infinite;
@ -124,12 +142,46 @@
50%{background-position:50% 100%}
100%{background-position:51% 0%}
}
.card-wrap {
float: left;
width: 160px;
height: 294px;
position: relative;
padding: 4px;
}
.card-wrap:hover {
z-index: 100;
}
</style>
<div class="bla ani">
<div class="card-wrap">
<div class="bla ani"></div>
<img src="http://80.240.132.120/gwent/assets/cards/ballista1.png" class="card" width="150" height="auto">
<div class="shadow"></div>
<div class="overlay-card"></div>
</div>
<div class="card-wrap">
<div class="bla ani"></div>
<img src="http://80.240.132.120/gwent/assets/cards/archer.png" class="card" width="150" height="auto">
<div class="shadow"></div>
<div class="overlay-card"></div>
</div>
<div class="card-wrap">
<div class="bla ani"></div>
<img src="http://80.240.132.120/gwent/assets/cards/eilhart.png" class="card" width="150" height="auto">
<div class="shadow"></div>
<div class="overlay-card"></div>
</div>
<div class="card-wrap">
<div class="bla ani"></div>
<img src="http://80.240.132.120/gwent/assets/cards/geralt.png" class="card" width="150" height="auto">
<div class="shadow"></div>
<div class="overlay-card"></div>
</div>
</div>

View File

@ -22,6 +22,10 @@
width: 220px;
@include secondGradient();
.container-form-landing & {
width: 170px;
}
}
.wrap-btn-action {

View File

@ -13,7 +13,7 @@ body.landing {
}
.wrap-landing {
max-width: 900px;
max-width: 1000px;
margin: 0 auto;
}

View File

@ -14,7 +14,7 @@ class CreateUsersTable extends Migration
{
Schema::create('users', function (Blueprint $table) {
$table->increments('id');
$table->string('name');
$table->string('username')->unique();
$table->string('email')->unique();
$table->string('password', 60);
$table->rememberToken();