From 41ffc9b3534e6240ab918955ee5d1454256d4938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien@fastre.info>
Date: Tue, 5 Nov 2013 13:25:25 +0100
Subject: [PATCH] work on style and view and layout

---
 Resources/assets/gumpy/sass/_searchbox.scss |  4 ++++
 Resources/assets/gumpy/sass/chillmain.scss  |  2 ++
 Resources/config/routing.yml                |  4 ----
 Resources/public/css/chillmain.css          |  1 +
 Resources/views/layout.html.twig            | 10 ++++++----
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Resources/assets/gumpy/sass/_searchbox.scss b/Resources/assets/gumpy/sass/_searchbox.scss
index 07f8a8eda..04f6415f7 100644
--- a/Resources/assets/gumpy/sass/_searchbox.scss
+++ b/Resources/assets/gumpy/sass/_searchbox.scss
@@ -4,6 +4,10 @@ div#usefulbar {
     //to align with nav bar
     padding-right: 15px;
     
+    form {
+        margin: 0;
+    }
+    
     i.menu {
         font-size: 2em;
     }
diff --git a/Resources/assets/gumpy/sass/chillmain.scss b/Resources/assets/gumpy/sass/chillmain.scss
index fbd80d925..3961a6b6d 100644
--- a/Resources/assets/gumpy/sass/chillmain.scss
+++ b/Resources/assets/gumpy/sass/chillmain.scss
@@ -4,4 +4,6 @@
 
 @import "_flashMessages.scss";
 
+@import "_wrapper.scss";
+
 @import "_commons.scss";
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index 0c6fca885..661af236e 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -1,7 +1,3 @@
 cl_chill_main_homepage:
     pattern:  /hello
     defaults: { _controller: CLChillMainBundle:Default:index }
-    options:
-        menu: person
-        order: 0
-        label: HomePage
diff --git a/Resources/public/css/chillmain.css b/Resources/public/css/chillmain.css
index a0dabad27..aa76f5de5 100644
--- a/Resources/public/css/chillmain.css
+++ b/Resources/public/css/chillmain.css
@@ -1,4 +1,5 @@
 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 ul { display: flex; justify-content: flex-end; margin: 0; padding-top: 5px; padding-right: 10px; }
 div#usefulbar li { color: white; margin-left: 10px; }
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index ed0c55ca8..22aec854f 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -10,6 +10,8 @@
     <link rel="stylesheet" href="{{ asset_url }}"/>
     {% endstylesheets %}
     
+    {% block css%}<!-- nothing added to css -->{% endblock %}
+    
     {% javascripts output="js/modernizer.js"  
           "bundles/clchillmain/js/modernizr-2.6.2.min.js" %}
     <script src="{{ asset_url }}" type="text/javascript" ></script>
@@ -24,17 +26,17 @@
         <nav id="header" class="navbar pretty" >
             
           
-            
-                <div id="logo" class="five columns logo">
+            <!--
+                <div id="logo" class="six columns logo">
 
                 </div>
-
+   -->
                 
 
                         
 
    
-                <ul id="nav_list" class="push_five six columns">
+                <ul id="nav_list" class="six columns">
                     <li><a href="#">Bonjour {utilisateur}</a></li>
                     <li><a href="#"><i class="icon-users"></i></a></li>
                     <li><a href="#"><i class="icon-export"></i></a></li>