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

work on style and view and layout

Browse Source
This commit is contained in:
Julien Fastré 2013-11-05 13:25:25 +01:00
parent 7e9f34ce57
commit 41ffc9b353
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/assets/gumpy/sass/_searchbox.scss
View File

@ -4,6 +4,10 @@ div#usefulbar {
//to align with nav bar //to align with nav bar
padding-right: 15px; padding-right: 15px;
form {
margin: 0;
}
i.menu { i.menu {
font-size: 2em; font-size: 2em;
} }

2
Resources/assets/gumpy/sass/chillmain.scss
View File

@ -4,4 +4,6 @@
@import "_flashMessages.scss"; @import "_flashMessages.scss";
@import "_wrapper.scss";
@import "_commons.scss"; @import "_commons.scss";

4
Resources/config/routing.yml
View File

@ -1,7 +1,3 @@
cl_chill_main_homepage: cl_chill_main_homepage:
pattern: /hello pattern: /hello
defaults: { _controller: CLChillMainBundle:Default:index } defaults: { _controller: CLChillMainBundle:Default:index }
options:
menu: person
order: 0
label: HomePage

1
Resources/public/css/chillmain.css
View File

@ -1,4 +1,5 @@
div#usefulbar { background-color: #fbba3a; z-index: 1000; padding-right: 15px; } div#usefulbar { background-color: #fbba3a; z-index: 1000; padding-right: 15px; }
div#usefulbar form { margin: 0; }
div#usefulbar i.menu { font-size: 2em; } div#usefulbar i.menu { font-size: 2em; }
div#usefulbar ul { display: flex; justify-content: flex-end; margin: 0; padding-top: 5px; padding-right: 10px; } div#usefulbar ul { display: flex; justify-content: flex-end; margin: 0; padding-top: 5px; padding-right: 10px; }
div#usefulbar li { color: white; margin-left: 10px; } div#usefulbar li { color: white; margin-left: 10px; }

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

@ -10,6 +10,8 @@
<link rel="stylesheet" href="{{ asset_url }}"/> <link rel="stylesheet" href="{{ asset_url }}"/>
{% endstylesheets %} {% endstylesheets %}
{% block css%}<!-- nothing added to css -->{% endblock %}
{% javascripts output="js/modernizer.js" {% javascripts output="js/modernizer.js"
"bundles/clchillmain/js/modernizr-2.6.2.min.js" %} "bundles/clchillmain/js/modernizr-2.6.2.min.js" %}
<script src="{{ asset_url }}" type="text/javascript" ></script> <script src="{{ asset_url }}" type="text/javascript" ></script>
@ -24,17 +26,17 @@
<nav id="header" class="navbar pretty" > <nav id="header" class="navbar pretty" >
<!--
<div id="logo" class="five columns logo"> <div id="logo" class="six columns logo">
</div> </div>
-->
<ul id="nav_list" class="six columns">
<ul id="nav_list" class="push_five six columns">
<li><a href="#">Bonjour {utilisateur}</a></li> <li><a href="#">Bonjour {utilisateur}</a></li>
<li><a href="#"><i class="icon-users"></i></a></li> <li><a href="#"><i class="icon-users"></i></a></li>
<li><a href="#"><i class="icon-export"></i></a></li> <li><a href="#"><i class="icon-export"></i></a></li>