From 4bee44f11d3e5e3fd912f0e2728a547f56887d65 Mon Sep 17 00:00:00 2001 From: devfake Date: Tue, 23 Jun 2015 13:31:37 +0200 Subject: [PATCH 1/5] enable hover for card animation --- .../client/app/modules/lobby/views/lobby.html | 51 ++++++++++++++----- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/site/client/app/modules/lobby/views/lobby.html b/site/client/app/modules/lobby/views/lobby.html index 9fbe3f2..1dc4512 100644 --- a/site/client/app/modules/lobby/views/lobby.html +++ b/site/client/app/modules/lobby/views/lobby.html @@ -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,19 @@ } .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); 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,9 +140,18 @@ 50%{background-position:50% 100%} 100%{background-position:51% 0%} } + + .card-wrap { + float: left; + width: 160px; + height: 294px; + position: relative; + padding: 4px; + } -
+
+
From abae0ac9bb8b9eafbc2ce0b5ee967c978dd67232 Mon Sep 17 00:00:00 2001 From: devfake Date: Tue, 23 Jun 2015 13:33:35 +0200 Subject: [PATCH 2/5] add more cards for preview --- .../client/app/modules/lobby/views/lobby.html | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/site/client/app/modules/lobby/views/lobby.html b/site/client/app/modules/lobby/views/lobby.html index 1dc4512..c25bf63 100644 --- a/site/client/app/modules/lobby/views/lobby.html +++ b/site/client/app/modules/lobby/views/lobby.html @@ -157,4 +157,25 @@
+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+
+
\ No newline at end of file From f6ab7890cdae28346b6821c77a85130a337ee289 Mon Sep 17 00:00:00 2001 From: devfake Date: Tue, 23 Jun 2015 13:34:25 +0200 Subject: [PATCH 3/5] minor fix --- site/client/app/modules/lobby/views/lobby.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site/client/app/modules/lobby/views/lobby.html b/site/client/app/modules/lobby/views/lobby.html index c25bf63..e111111 100644 --- a/site/client/app/modules/lobby/views/lobby.html +++ b/site/client/app/modules/lobby/views/lobby.html @@ -148,6 +148,10 @@ position: relative; padding: 4px; } + + .card-wrap:hover { + z-index: 10; + }
From 750914882a1f91c791dc6df97e56b30488864587 Mon Sep 17 00:00:00 2001 From: devfake Date: Tue, 23 Jun 2015 14:13:10 +0200 Subject: [PATCH 4/5] minor styling --- site/client/app/modules/lobby/views/lobby.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/site/client/app/modules/lobby/views/lobby.html b/site/client/app/modules/lobby/views/lobby.html index e111111..5017619 100644 --- a/site/client/app/modules/lobby/views/lobby.html +++ b/site/client/app/modules/lobby/views/lobby.html @@ -111,7 +111,9 @@ 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; @@ -150,7 +152,7 @@ } .card-wrap:hover { - z-index: 10; + z-index: 100; } From 01f54264e725351b5abdb48ca62ad97f8dfb9300 Mon Sep 17 00:00:00 2001 From: devfake Date: Tue, 23 Jun 2015 14:13:27 +0200 Subject: [PATCH 5/5] add email for registration, set migration --- site/client/app/modules/landing/views/landing.html | 1 + site/client/assets/sass/_form.scss | 4 ++++ site/client/assets/sass/_landing.scss | 2 +- .../migrations/2014_10_12_000000_create_users_table.php | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/site/client/app/modules/landing/views/landing.html b/site/client/app/modules/landing/views/landing.html index 883aac7..a9c2e41 100644 --- a/site/client/app/modules/landing/views/landing.html +++ b/site/client/app/modules/landing/views/landing.html @@ -13,6 +13,7 @@
+
diff --git a/site/client/assets/sass/_form.scss b/site/client/assets/sass/_form.scss index 08dec80..9fc7dbd 100644 --- a/site/client/assets/sass/_form.scss +++ b/site/client/assets/sass/_form.scss @@ -22,6 +22,10 @@ width: 220px; @include secondGradient(); + + .container-form-landing & { + width: 170px; + } } .wrap-btn-action { diff --git a/site/client/assets/sass/_landing.scss b/site/client/assets/sass/_landing.scss index d50a6d0..668e418 100644 --- a/site/client/assets/sass/_landing.scss +++ b/site/client/assets/sass/_landing.scss @@ -13,7 +13,7 @@ body.landing { } .wrap-landing { - max-width: 900px; + max-width: 1000px; margin: 0 auto; } diff --git a/site/server/database/migrations/2014_10_12_000000_create_users_table.php b/site/server/database/migrations/2014_10_12_000000_create_users_table.php index 65d3d08..a1c7b16 100755 --- a/site/server/database/migrations/2014_10_12_000000_create_users_table.php +++ b/site/server/database/migrations/2014_10_12_000000_create_users_table.php @@ -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();