diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css index e5a43d7..bc5e7b0 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css @@ -1,12 +1,15 @@ main { - background: #34495e; position: fixed; width: 100%; height: 100%; } +main > div { + background: rgba(52, 73, 94, 0.9); +} + main .form { - border-top: 2px solid #3498db; + /*border-top: 2px solid #3498db;*/ } main .checkbox { @@ -14,7 +17,7 @@ main .checkbox { } .facebook { - border-top: 2px solid #3498db; + border-bottom: 1px solid #3498db; padding: 40px; margin: 20px; } @@ -112,12 +115,15 @@ main .checkbox { } .input__field--kozakura { + background: transparent; + width: 100%; + font-size: 1.55em; + color: #2F3238; + border-bottom: 1px solid #3498db; padding: 0.25em 0.5em; margin-top: 1.25em; - width: 100%; - background: transparent; - color: #2F3238; - font-size: 1.55em; + margin-bottom: 0.5em; + opacity: 0; } diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/login.css b/src/Jotunheimr/UserBundle/Resources/public/css/login.css index 160e280..bca7f5c 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/login.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/login.css @@ -1,3 +1,9 @@ +main { + background: url("/bundles/jotunheimruser/images/landscape-2.jpeg"); + background-size: cover; + background-position: center center; +} + main .login { position: fixed; display: flex; @@ -8,11 +14,21 @@ main .login { flex-direction: column; } +main .login .login-container { + background: #FFFFFF; + display: table; + 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); +} + main .login h1 { display: block; font: normal 40px 'Gloria Hallelujah', cursive; text-align: center; - color: #FFFFFF; + color: #3498db; + margin-top: 0; } main .login .form .input { @@ -20,12 +36,16 @@ main .login .form .input { margin: 0 auto; } +main .login .form .checkbox { + color: #3498db; +} + main .login .form .submit { - background: #3498db; + background: none; display: block; font: bold 22px 'Gloria Hallelujah', cursive; color: #FFFFFF; - border: 0; + border: 2px solid #3498db; padding: 10px 20px; margin: 20px auto 0 auto; @@ -34,8 +54,7 @@ main .login .form .submit { } main .login .form .submit:hover { - background: #FFFFFF; - color: #3498db; + background: #3498db; -webkit-transition: all 250ms cubic-bezier(0, 0.25, 0.5, 1); transition: all 250ms cubic-bezier(0, 0.25, 0.5, 1); diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/register.css b/src/Jotunheimr/UserBundle/Resources/public/css/register.css index 8b85dfc..8d3fa63 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/register.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/register.css @@ -1,3 +1,9 @@ +main { + background: url("/bundles/jotunheimruser/images/landscape-3.jpeg"); + background-size: cover; + background-position: center center; +} + main .register { position: fixed; display: flex; @@ -21,11 +27,11 @@ main .register .form .input { } main .register .form .submit { - background: #3498db; + background: none; display: block; font: bold 22px 'Gloria Hallelujah', cursive; color: #FFFFFF; - border: 0; + border: 2px solid #3498db; padding: 10px 20px; margin: 20px auto 0 auto; @@ -34,8 +40,7 @@ main .register .form .submit { } main .register .form .submit:hover { - background: #FFFFFF; - color: #3498db; + background: #3498db; -webkit-transition: all 250ms cubic-bezier(0, 0.25, 0.5, 1); transition: all 250ms cubic-bezier(0, 0.25, 0.5, 1); diff --git a/src/Jotunheimr/UserBundle/Resources/public/images/landscape-1.jpg b/src/Jotunheimr/UserBundle/Resources/public/images/landscape-1.jpg new file mode 100644 index 0000000..636648e Binary files /dev/null and b/src/Jotunheimr/UserBundle/Resources/public/images/landscape-1.jpg differ diff --git a/src/Jotunheimr/UserBundle/Resources/public/images/landscape-2.jpeg b/src/Jotunheimr/UserBundle/Resources/public/images/landscape-2.jpeg new file mode 100644 index 0000000..0355ea4 Binary files /dev/null and b/src/Jotunheimr/UserBundle/Resources/public/images/landscape-2.jpeg differ diff --git a/src/Jotunheimr/UserBundle/Resources/public/images/landscape-3.jpeg b/src/Jotunheimr/UserBundle/Resources/public/images/landscape-3.jpeg new file mode 100644 index 0000000..4fb7075 Binary files /dev/null and b/src/Jotunheimr/UserBundle/Resources/public/images/landscape-3.jpeg differ diff --git a/src/Jotunheimr/UserBundle/Resources/public/images/landscape-4.jpg b/src/Jotunheimr/UserBundle/Resources/public/images/landscape-4.jpg new file mode 100644 index 0000000..2a35e39 Binary files /dev/null and b/src/Jotunheimr/UserBundle/Resources/public/images/landscape-4.jpg differ diff --git a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig index 20d4414..7dc1601 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig @@ -4,12 +4,14 @@ {% block fos_user_content %}
+ {% include('@JotunheimrUser/Social/facebook.html.twig') %} +

Sign up

{{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }} - + {##}
{{ form_widget(form.email, {'attr': {'class': 'input__field input__field--kozakura'}}) }} @@ -67,8 +69,6 @@
{{ form_end(form) }}
- - {% include('@JotunheimrUser/Social/facebook.html.twig') %}
{% endblock fos_user_content %} diff --git a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig index 1e15d4d..3c13a28 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig @@ -8,54 +8,56 @@ {% endif %}
-

- Sign in -

+
+ {#{% include('@JotunheimrUser/Social/facebook.html.twig') %}#} -
-
- +

+ Sign in +

-
- -
- - {% include('@JotunheimrUser/Social/facebook.html.twig') %}
{% endblock fos_user_content %} diff --git a/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg b/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg new file mode 100644 index 0000000..2f42201 Binary files /dev/null and b/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg differ