SplendidBear-Websites/MineSeeker
Private
Public Access
1
0
Fork 0
Code Pull Requests 1 Releases Activity

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

Browse Source
This commit is contained in:
Root
2016-12-11 18:25:19 +01:00
parent 68c6a277ba
commit 664ef5b424
14 changed files with 733 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Jotunheimr/UserBundle/Resources/public/css/layout.css
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;
}
}

8
src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig
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"#}

10
src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig
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"#}

11
src/Jotunheimr/UserBundle/Resources/views/layout.html.twig
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>