From 1e9bdbac3fc1db8393a4b3635bf56b5448881f52 Mon Sep 17 00:00:00 2001 From: Lang Date: Tue, 15 Nov 2016 17:53:12 +0100 Subject: [PATCH] bugfix entities gridrow, grid && improve graph design on homepage --- app/Resources/views/base.html.twig | 29 +++--- .../Resources/public/css/layout.css | 14 +-- .../UserBundle/Resources/public/css/login.css | 58 +++++++++--- .../Resources/public/css/register.css | 2 +- .../Resources/views/Security/login.html.twig | 87 ++++++++++-------- .../Resources/views/Social/facebook.html.twig | 68 +++++++------- .../Core/User/MyFOSUBUserProvider.php | 26 +++++- src/Mine/SeekerBundle/Entity/Grid.php | 35 +++++++ src/Mine/SeekerBundle/Entity/Grid.php~ | 36 +------- .../Resources/public/css/style.homepage.css | 91 +++++++++++++++++++ .../Resources/public/css/style.mineseeker.css | 5 + .../Resources/public/js/mine-seeker/app.js | 21 ++--- .../Resources/views/Game/index.html.twig | 22 ++++- 13 files changed, 327 insertions(+), 167 deletions(-) create mode 100644 src/Mine/SeekerBundle/Resources/public/css/style.homepage.css diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 6ec94eb..a256e69 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -4,25 +4,20 @@ {% block title %}Welcome!{% endblock %} - {% block stylesheets %} - {#{% stylesheets filter='cssrewrite' - '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/css/bootstrap.min.css' - '@TollTereloBundle/Resources/public/css/style.css' %} - - {% endstylesheets %}#} - {% endblock %} + {% block stylesheets %}{% endblock %} -{% block body %}{% endblock %} -{% block javascripts %} - {#{% javascripts - '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-3.0.0.min.js' - '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-migrate-3.0.0.min.js' - '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/js/bootstrap.min.js' - '@TollTereloBundle/Resources/public/js/script.js' %} - - {% endjavascripts %}#} -{% endblock %} +
+ {% block header %}{% endblock %} +
+
+ {% block body %}{% endblock %} +
+ + +{% block javascripts %}{% endblock %} diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css index bc5e7b0..24ae639 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css @@ -16,16 +16,12 @@ main .checkbox { color: #FFFFFF; } -.facebook { - border-bottom: 1px solid #3498db; - padding: 40px; - margin: 20px; -} - .fb-login { - background: #3498db; + display: block; + background: #1a6190; font: bold 22px 'Gloria Hallelujah', cursive; - color: #FFFFFF; + text-align: center; + color: #2c3e50; padding: 15px 20px; margin: 20px; @@ -164,7 +160,7 @@ main .checkbox { } .graphic--kozakura { - fill: #3498db; + fill: #2c3e50; pointer-events: none; top: 1em; bottom: 0; diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/login.css b/src/Jotunheimr/UserBundle/Resources/public/css/login.css index bca7f5c..62f53da 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/login.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/login.css @@ -1,5 +1,5 @@ main { - background: url("/bundles/jotunheimruser/images/landscape-2.jpeg"); + background: url('/bundles/mineseeker/images/homepage/header.jpg'); background-size: cover; background-position: center center; } @@ -15,19 +15,43 @@ main .login { } main .login .login-container { - background: #FFFFFF; - display: table; + background: #2980b9; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + width: 100%; padding: 1em; - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.8); - box-shadow: 0 0 5px rgba(0, 0, 0, 0.8); + -webkit-box-shadow: 0 5px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 5px 7px rgba(0, 0, 0, 0.3); +} + +main .login .login-container .login-form { + display: flex; + align-items: center; + justify-content: center; + flex-direction: row; + width: 50%; +} + +main .login .login-container .login-item { + width: 50%; +} + +main .login .login-container .login-item h2 { + text-align: center; +} + +main .login .login-container .login-item:first-child { + border-right: 1px solid #3498db; } main .login h1 { display: block; - font: normal 40px 'Gloria Hallelujah', cursive; + font: normal 72px 'Gloria Hallelujah', cursive; text-align: center; - color: #3498db; + color: #2c3e50; margin-top: 0; } @@ -37,20 +61,26 @@ main .login .form .input { } main .login .form .checkbox { - color: #3498db; + color: #2c3e50; +} + +main .checkbox label, main .radio label { + font: bolder 18px "Avenir Next", "Helvetica Neue", Helvetica, Arial, sans-serif; } main .login .form .submit { - background: none; + background: #1a6190; display: block; - font: bold 22px 'Gloria Hallelujah', cursive; - color: #FFFFFF; - border: 2px solid #3498db; - padding: 10px 20px; - margin: 20px auto 0 auto; + font: bolder 22px "Avenir Next", "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #2c3e50; + border: 0; + padding: 10px 70px; + margin: 20px auto 40px auto; -webkit-transition: all 250ms cubic-bezier(0, 0.25, 0.5, 1); transition: all 250ms cubic-bezier(0, 0.25, 0.5, 1); + -webkit-border-radius: 3px; + border-radius: 3px; } main .login .form .submit:hover { diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/register.css b/src/Jotunheimr/UserBundle/Resources/public/css/register.css index 8d3fa63..f56e3dc 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/register.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/register.css @@ -1,5 +1,5 @@ main { - background: url("/bundles/jotunheimruser/images/landscape-3.jpeg"); + background: url('/bundles/mineseeker/images/homepage/header.jpg'); background-size: cover; background-position: center center; } diff --git a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig index 3c13a28..8c9d33e 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig @@ -9,53 +9,64 @@