Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

Improving the templates refs closed #628 #627

Browse Source
This commit is contained in:
Marc Ducobu 2015-10-23 13:21:52 +02:00
parent aabcb85f37
commit 69a970cd14
6 changed files with 111 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Resources/public/css/scratch.css
View File

@ -4239,8 +4239,9 @@ a {
vertical-align: middle; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000333}}
.navigation .nav {
z-index: 9999999; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000338}}
z-index: 9999999;
height: 60px; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000339}}
.navigation ul.navigation-menu {
-webkit-transform-style: preserve-3d;
clear: both;
@ -4253,7 +4254,7 @@ a {
display: inline-block;
margin: 0;
padding: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000356}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000357}}
.navigation ul li.nav-link {
background: #333333;
display: block;
@ -4268,33 +4269,33 @@ a {
line-height: 60px;
text-decoration: none;
width: auto; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000374}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000375}}
.navigation ul li.nav-link a {
color: white;
display: inline-block;
font-weight: 400;
padding-right: 1em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000383}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000384}}
.navigation ul li.nav-link a:hover {
color: white; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000389}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000390}}
.navigation .active-nav-item a {
border-bottom: 1px solid rgba(255, 255, 255, 0.5);
padding-bottom: 3px; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000395}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\0000396}}
.navigation li.more.nav-link {
padding-right: 0;
padding-right: 1em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003102}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003103}}
.navigation li.more.nav-link > ul > li:first-child a {
padding-top: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003106}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003107}}
.navigation li.more.nav-link a {
margin-right: 1em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003110}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003111}}
.navigation li.more.nav-link > a {
padding-right: 0.6em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003114}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003115}}
.navigation li.more.nav-link > a:after {
position: absolute;
top: auto;
@ -4303,55 +4304,55 @@ a {
left: auto;
content: "▾";
color: rgba(255, 255, 255, 0.7); }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003121}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003122}}
.navigation li.more {
overflow: visible;
padding-right: 0;
padding-right: .8em;
position: relative; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003125}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003126}}
.navigation li.more a {
padding-right: .8em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003129}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003130}}
.navigation li.more > a {
padding-right: 1.6em;
position: relative;
margin-right: 1em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003137}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003138}}
.navigation li.more > a:after {
content: '›';
font-size: 1.2em;
position: absolute;
right: 0.5em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003145}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003146}}
.navigation li.more:hover > .submenu {
display: block; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003155}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003156}}
.navigation ul.submenu {
display: none;
padding-left: 0;
left: -1em;
position: absolute;
top: 1.5em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003164}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003165}}
.navigation ul.submenu .submenu {
left: 11.8em;
top: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003171}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003172}}
.navigation ul.submenu li {
display: block;
padding-right: 0;
line-height: 46.15385px; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003178}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003179}}
.navigation ul.submenu li:first-child > a {
border-top-left-radius: 0;
border-top-right-radius: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003183}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003184}}
.navigation ul.submenu li:last-child > a {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
padding-bottom: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003190}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003191}}
.navigation ul.submenu li a {
background-color: #2b2b2b;
display: inline-block;
@ -4360,24 +4361,24 @@ a {
background-color: #333333;
padding-left: 1em;
text-align: left; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003207}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003208}}
.navigation .navigation-search {
padding: 17px 0 0;
position: relative; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003211}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003212}}
.navigation .navigation-search input[type=search] {
padding: .6em .55em;
padding-right: 3.5em;
width: calc(100% - 4.5em);
font-size: .9em;
margin: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003225}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003226}}
.navigation .navigation-search button {
padding: 7px 12px;
position: absolute;
top: .99em;
right: 1em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003233}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003234}}
.navigation ul li.nav-link2 {
position: relative;
padding-right: 2em;
@ -4386,18 +4387,18 @@ a {
z-index: 9999;
float: left;
list-style: none; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003242}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003243}}
.navigation ul li.nav-link2 div.li-content {
display: inline-block;
line-height: normal;
vertical-align: middle; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003247}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003248}}
.navigation ul li.nav-link2 div.li-content a.more:after {
content: "▾";
color: rgba(255, 255, 255, 0.7);
padding-left: 0.4em;
font-size: 1.2em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003255}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003256}}
.navigation ul li.nav-link2 ul {
display: none;
position: absolute;
@ -4407,25 +4408,25 @@ a {
padding-right: 1.5em;
padding-left: 1.5em;
width: 100%; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003267}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003268}}
.navigation ul li.nav-link2 ul li {
padding-top: 0.7em;
padding-bottom: 0.7em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003271}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003272}}
.navigation ul li.nav-link2 ul li:first-child {
padding-top: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003275}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003276}}
.navigation ul li.nav-link2 ul li:last-child {
padding-bottom: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003281}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003282}}
.navigation ul li.nav-link2:hover ul {
display: block; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003285}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003286}}
.navigation ul li.nav-link2 a {
width: 100%;
color: white;
font-weight: 400; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003290}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/marcu\/Projects\/Chill\/vendor\/chill-project\/main\/Resources\/public\/sass\/modules\/_navigation\.scss}line{font-family:\00003291}}
.navigation ul li.nav-link2 a:hover {
color: white; }

2
Resources/public/css/scratch.css.map
View File

File diff suppressed because one or more lines are too long

3
Resources/views/Admin/layout.html.twig
View File

@ -18,6 +18,9 @@
{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
{% block navigation_search_bar %}{% endblock %}
{% block navigation_section_menu %}{% endblock %}
{% block vertical_menu_content %}
{{ chill_menu('admin', {
'layout': 'ChillMainBundle::Menu/admin.html.twig',

7
Resources/views/Menu/verticalMenu.html.twig
View File

@ -20,8 +20,8 @@
Layout for a vertical menu (like admin, export) to use with the
layout ../layoutWithVerticalMenu.html.twig.
#}
<div class="grid-4">
<ul class="tab-nav follow-href-path">
<ul class="tab-nav follow-href-path">
<li class="title">
{% block v_menu_title %}<!-- title of the verticalMenu is empty -->{% endblock %}
</li>
@ -34,5 +34,4 @@
<a href="{{ path(route.key, args ) }}" >{{ route.label|trans }}</a>
</li>
{% endfor %}
</ul>
</div>
</ul>

14
Resources/views/layout.html.twig
View File

@ -16,6 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{#
The basic layout of Chill. All other layouts must extend this layout.
#}
<!DOCTYPE html>
<html lang="fr">
<head>
@ -56,9 +60,11 @@
<div class="grid-8 text-right">
<div class="nav">
<ul class="navigation-menu">
{% block navigation_section_menu %}
{{ chill_menu('section', {
'layout': 'ChillMainBundle::Menu/section.html.twig',
}) }}
{% endblock %}
{{ chill_menu('user', {
'layout': 'ChillMainBundle::Menu/user.html.twig',
@ -87,17 +93,21 @@
</ul>
</div>
{% block navigation_search_bar %}
<div class="navigation-search">
<form action="{{ path('chill_main_search') }}" method="get">
<input name="q" type="search" placeholder="{{ 'Search'|trans }}" {% if _search_pattern is defined %}value="{{ _search_pattern }}"{% endif %}/>
<button type="submit" class="sc-button"><i class="fa fa-search fa-flip-horizontal"></i></button>
</form>
</div>
{% endblock %}
</div>
</header>
{% block top_banner %}{# To use if you want to add a banner below the header (ie the menu) #}{% endblock %}
<div id="content_conainter">
{% block layout_content %}
{% block sublayout_containter %}
<div class="container content">
{# Flash messages ! #}
{% for flashMessage in app.session.flashbag.get('success') %}
@ -149,7 +159,7 @@
</div>
<footer class="footer">
<p>Programme sous license <b>AGPL</b></p>
<p>{{ 'Programme sous license' | trans }} <b>AGPL</b></p>
</footer>
<script type="text/javascript">

10
Resources/views/layoutWithVerticalMenu.html.twig
View File

@ -23,9 +23,9 @@
{% extends "ChillMainBundle::layout.html.twig" %}
{% block layout_content %}
<div class="container content">
<div class="grid-8">
{% block sublayout_containter %}
<div class="container content">
<div class="grid-8 push-1">
{# Flash messages ! #}
<div class="container">
{% for flashMessage in app.session.flashbag.get('success') %}
@ -57,7 +57,9 @@
{% endblock %}
</div>
<div class="grid-3 float-right">
{% block vertical_menu_content %}<!-- vertical menu of the layoutWithVerticalMenu is empty -->
{% endblock %}
</div>
</div>
</div>
{% endblock %}