Skip to content

just fix template and css #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ParmentierChristophe wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

just fix template and css #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a183e2c
change style navbar and add Arraycollection namespace for user register
ParmentierChristophe Oct 8, 2018
12d7eac
fix my error on css .nav-link
ParmentierChristophe Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Resources/views/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<!-- Footer with random text -->
<div class="jumbotron jumbotron-fluid darkBlue tWhite mb-0">
<div class="container text-center">
<h4>Une création <a href="www.thomas-gossart.fr">Thomas Gossart</a> pour les apprenants de Simplon Roubaix</h4>
<h4>Une création <a href="http://www.thomas-gossart.fr">Thomas Gossart</a> pour les apprenants de Simplon Roubaix</h4>
</div>
</div>

Expand Down
1 change: 1 addition & 0 deletions src/CoreBundle/Entity/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
namespace CoreBundle\Entity;

use FOS\UserBundle\Model\User as BaseUser;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;

/**
Expand Down
8 changes: 4 additions & 4 deletions src/CoreBundle/Resources/views/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<a class="nav-link tWhite" href="{{ path('default')}}">Accueil<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle tWhite" type="button" role="button" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link dropdown-toggle tWhite" role="button" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Langages
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
Expand All @@ -33,10 +33,10 @@
</ul>
</div>
{% if app.user.username is defined %}
<a href="{{ path('fos_user_profile_show')}}"><i class="fa fa-user-circle fa-2x" aria-hidden="true"></i>Profile</a>
<a href="{{ path('fos_user_security_logout')}}"><i class="fa fa-sign-out fa-2x" aria-hidden="true"></i>Deconnexion</a>
<a class="tWhite" href="{{ path('fos_user_profile_show')}}"><i class="fa fa-user-circle fa-2x tWhite" aria-hidden="true"></i>Profile</a>
<a class="tWhite" href="{{ path('fos_user_security_logout')}}"><i class="fa fa-sign-out fa-2x tWhite" aria-hidden="true"></i>Deconnexion</a>
{% else %}
<a href="{{ path('fos_user_security_login')}}"><i class="fa fa-sign-in fa-2x" aria-hidden="true"></i>Connexion</a>
<a class="tWhite" href="{{ path('fos_user_security_login')}}"><i class="fa fa-sign-in fa-2x tWhite" aria-hidden="true"></i>Connexion</a>
{% endif %}
</nav>

Expand Down