Private
Public Access
1
0

add english lang everywhere && add snowfall && add centralized version nbr && improve stylesheet && slack integration

This commit is contained in:
2016-12-11 18:25:19 +01:00
parent 68c6a277ba
commit 664ef5b424
14 changed files with 733 additions and 46 deletions

View File

@@ -111,8 +111,8 @@ header section form {
z-index: 2;
}
header section a.fb-login,
header section a.slack-login {
header section div.buttons > a.fb-login,
header section div.buttons > a.slack-login {
position: relative;
display: block;
width: 500px;
@@ -128,39 +128,39 @@ header section a.slack-login {
box-shadow: 0 3px 5px rgba(0, 0, 0, 0.15);
}
header section a.fb-login:hover,
header section a.slack-login:hover {
header section div.buttons > a.fb-login:hover,
header section div.buttons > a.slack-login:hover {
text-decoration: none;
-webkit-box-shadow: 0 7px 10px rgba(0, 0, 0, 0.1);
box-shadow: 0 7px 10px rgba(0, 0, 0, 0.1);
}
header section a.fb-login i,
header section a.slack-login i {
header section div.buttons > a.fb-login i,
header section div.buttons > a.slack-login i {
position: absolute;
font-size: 130px;
top: 0;
left: 15px;
}
header section a.fb-login {
header section div.buttons > a.fb-login {
background: #5975b1;
border: 1px solid #50649f;
}
header section a.fb-login:hover {
header section div.buttons > a.fb-login:hover {
background: #42598c;
color: #FFFFFF;
}
header section a.slack-login {
header section div.buttons > a.slack-login {
background: #FFFFFF;
border: 1px solid #5c3a58;
color: #5c3a58;
}
header section a.slack-login:hover {
header section div.buttons > a.slack-login:hover {
background: #e6e6e6;
color: #5c3a58;
}
@@ -180,7 +180,8 @@ header section a.slack-login:hover {
width: 100%;
}
header section a.fb-login {
header section div.buttons > a.fb-login,
header section div.buttons > a.slack-login {
margin: 0 auto;
}
}
@@ -204,11 +205,13 @@ header section a.slack-login:hover {
width: 100%;
}
header section a.fb-login {
header section div.buttons > a.fb-login,
header section div.buttons > a.slack-login {
width: 100%;
}
header section a.fb-login span {
header section div.buttons > a.fb-login span,
header section div.buttons > a.slack-login span {
display: none;
}
}

View File

@@ -5,8 +5,10 @@
{% block fos_user_content %}
<section class="header-content">
<div class="logo">
<img src="{{ asset('bundles/mineseeker/images/mine-logo-txt.png') }}" alt="MineSeeker Logo w/ Txt"
border="0"/>
<a href="{{ path('MineSeekerBundle_homepage') }}" target="_self">
<img src="{{ asset('bundles/mineseeker/images/mine-logo-txt.png') }}" alt="MineSeeker Logo w/ Txt"
border="0"/>
</a>
</div>
<h1> Sign up </h1>
<div class="db">
@@ -39,7 +41,7 @@
</div>
</form>
</div>
<h3 class="or">vagy regisztrálj <u>egy</u> kattintással</h3>
<h3 class="or">or login <u>w/ one click</u></h3>
<div class="buttons">
{% include('@JotunheimrUser/Social/facebook.html.twig') %}
{#<a class="slack-login"#}

View File

@@ -9,10 +9,12 @@
<section class="header-content">
<div class="logo">
<img src="{{ asset('bundles/mineseeker/images/mine-logo-txt.png') }}" alt="MineSeeker Logo w/ Txt"
border="0"/>
<a href="{{ path('MineSeekerBundle_homepage') }}" target="_self">
<img src="{{ asset('bundles/mineseeker/images/mine-logo-txt.png') }}" alt="MineSeeker Logo w/ Txt"
border="0"/>
</a>
</div>
<h1>Bejelentkezés</h1>
<h1>Sign in</h1>
<form action="{{ path("fos_user_security_check") }}" method="post"
class="ac-custom ac-checkbox ac-boxfill">
<input type="hidden" name="_csrf_token" value="{{ csrf_token }}"/>
@@ -36,7 +38,7 @@
</button>
</div>
</form>
<h3 class="or">vagy jelentkezz be <u>egy</u> kattintással</h3>
<h3 class="or">or login <u>w/ one click</u></h3>
<div class="buttons">
{% include('@JotunheimrUser/Social/facebook.html.twig') %}
{#<a class="slack-login"#}

View File

@@ -86,10 +86,17 @@
{% 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'
'@JotunheimrUserBundle/Resources/public/js/circle.js' %}
'@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/js/bootstrap.min.js' %}
<script type="text/javascript" src="{{ asset_url }}"></script>
{% endjavascripts %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/JQuery-Snowfall/1.7.4/snowfall.jquery.min.js"
type="text/javascript"></script>
<script type="text/javascript">
$(function () {
$(document).snowfall({deviceorientation: true, round: true, minSize: 5, maxSize: 8});
});
</script>
{% endblock %}
</body>
</html>

View File

@@ -2,6 +2,9 @@
namespace Mine\SeekerBundle\Controller;
//use CL\Slack\Payload\ChatPostMessagePayload;
//use CL\Slack\Payload\UsersListPayload;
//use CL\Slack\Transport\ApiClient;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
@@ -9,6 +12,27 @@ class GameController extends Controller
{
public function indexAction()
{
// $apiClient = new ApiClient('xoxp-107639806167-107029084564-115427085733-cccaa4f96c89c87ce680c7f22acfd001');
//
// $usersListPayload = new UsersListPayload();
// $usersList = $apiClient->send($usersListPayload);
//
// dump($usersList);
//
// $payload = new ChatPostMessagePayload();
// $payload->setChannel('#general');
// $payload->setAsUser(true);
// $payload->setText('Hello world!');
// $response = $apiClient->send($payload);
// if ($response->isOk()) {
// dump('bazmeg');
// } else {
// dump($response->getError());
// dump($response->getErrorExplanation());
// }
return $this->render('MineSeekerBundle:Game:index.html.twig');
}

View File

@@ -36,6 +36,10 @@ header section div.logo img {
margin: 50px 0;
}
header section div.logo a {
display: block;
}
header section > img {
position: absolute;
width: 1300px;
@@ -73,7 +77,7 @@ header section h3 img {
width: 16px;
}
header section div > a {
header section div.buttons > a {
background: #83aed9;
display: table;
font: bold 32px 'Rajdhani', sans-serif;
@@ -94,7 +98,7 @@ header section div > a {
transition: all 250ms ease-in-out;
}
header section div > a:hover {
header section div.buttons > a:hover {
background: #86b5e1;
-webkit-box-shadow: 0 7px 15px rgba(0, 0, 0, 0.2);
@@ -105,7 +109,7 @@ header section div > a:hover {
transition: all 250ms ease-in-out;
}
header section div > a.small {
header section div.buttons > a.small {
background: transparent;
display: inline-block;
font: bold 22px 'Rajdhani', sans-serif;
@@ -121,7 +125,7 @@ header section div > a.small {
}
header section div > a.small:hover {
header section div.buttons > a.small:hover {
background: #658fb8;
border: 3px solid #658fb8;
color: #FFFFFF;
@@ -139,8 +143,8 @@ header section div > a.small:hover {
text-align: center;
}
header section div > a {
margin: 0 auto;
header section div.buttons > a {
margin: 0 auto 20px auto;
}
header section h1 {
@@ -170,7 +174,7 @@ header section div > a.small:hover {
width: 100%;
}
header section div > a {
header section div.buttons > a {
display: block;
}
}

View File

@@ -959,3 +959,28 @@ main {
#mine-wrapper .grid .field-wrapper .field img {
width: 80%;
}
.back-from-game {
display: inline-block;
position: fixed;
top: 20px;
left: 20px;
-ms-transform: scale(1); /* IE 9 */
-webkit-transform: scale(1); /* Safari */
transform: scale(1);
-webkit-transition: all 250ms cubic-bezier(.17,.67,.83,.67);
transition: all 250ms cubic-bezier(.17,.67,.83,.67);
}
.back-from-game img {
width: 100px;
}
.back-from-game:hover {
-ms-transform: scale(1.2); /* IE 9 */
-webkit-transform: scale(1.2); /* Safari */
transform: scale(1.2);
-webkit-transition: all 250ms cubic-bezier(.17,.67,.83,.67);
transition: all 250ms cubic-bezier(.17,.67,.83,.67);
}

View File

@@ -7,12 +7,15 @@
border="0"/>
</div>
<div>
<h2>Egy aknakereső játék</h2>
<h1>Újragondolva...</h1>
<a href="{{ path('MineSeekerBundle_gamePlay') }}">Most játszom egyet!</a>
<a href="{{ path('fos_user_registration_register') }}" class="small">Regisztrálok</a> &middot;
<a href="{{ path('fos_user_security_login') }}" class="small">Belépek</a>
<h3>version 0.18.11 (beta2) &middot; MineSeeker&copy; &middot; <a href="http://www.laszlolang.com">www.laszlolang.com</a>
<h2>A minesweeper game rethought...</h2>
<h1>...and you can play w/o register!!</h1>
<div class="buttons">
<a href="{{ path('MineSeekerBundle_gamePlay') }}">Play NOW!</a>
<a href="{{ path('fos_user_registration_register') }}" class="small">Sign up</a> &middot;
<a href="{{ path('fos_user_security_login') }}" class="small">Sign in</a>
</div>
<h3>
version {{ version }} &middot; MineSeeker&copy; &middot; <a href="http://www.laszlolang.com">www.laszlolang.com</a>
</h3>
</div>
<img src="{{ asset('bundles/mineseeker/images/mine-logo-logo.png') }}" alt="MineSeeker Logo" border="0"/>

View File

@@ -1,14 +1,9 @@
{% extends '::base.html.twig' %}
{% block metas %}
{#<meta property="og:url" content="http://www.your-domain.com/your-page.html" />#}
{#<meta property="og:type" content="website" />#}
{#<meta property="og:title" content="Your Website Title" />#}
{#<meta property="og:description" content="Your description" />#}
{#<meta property="og:image" content="http://www.your-domain.com/path/image.jpg" />#}
{% endblock %}
{% block body %}
<a class="back-from-game" href="{{ path('MineSeekerBundle_homepage') }}">
<img src="{{ asset('bundles/mineseeker/images/mine-logo-txt.png') }}" alt="Mineseeker Logo">
</a>
<div class="mine-container">
<div id="mine-wrapper"
data-env="{{ env }}"
@@ -18,6 +13,14 @@
</div>
{% endblock %}
{% block metas %}
{#<meta property="og:url" content="http://www.your-domain.com/your-page.html" />#}
{#<meta property="og:type" content="website" />#}
{#<meta property="og:title" content="Your Website Title" />#}
{#<meta property="og:description" content="Your description" />#}
{#<meta property="og:image" content="http://www.your-domain.com/path/image.jpg" />#}
{% endblock %}
{% block stylesheets %}
{% stylesheets filter='?uglifycss'
'@MineSeekerBundle/Resources/public/css/style.mineseeker.css' %}