From 4fc2d1d0a09864a4aeed3ef48a096c7ea9716776 Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc@champs-libres.coop>
Date: Mon, 29 Jun 2015 14:29:09 +0200
Subject: [PATCH] Design of the user menu

---
 .../sass/custom/modules/_navigation.scss       |  6 ++++--
 Resources/views/Menu/section.html.twig         | 18 +++++++++++-------
 Resources/views/Menu/user.html.twig            |  6 +++++-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Resources/public/sass/custom/modules/_navigation.scss b/Resources/public/sass/custom/modules/_navigation.scss
index 535ab4024..6f780fa87 100644
--- a/Resources/public/sass/custom/modules/_navigation.scss
+++ b/Resources/public/sass/custom/modules/_navigation.scss
@@ -1,9 +1,11 @@
-// For cutomizing the navigation
-
 .navigation {
    background-color: $chill-blue;
 
    li.more.nav-link {
+      a {
+         margin-bottom: 2px;
+      }
+
       a:after {
          color: $chill-dark-gray;
       }
diff --git a/Resources/views/Menu/section.html.twig b/Resources/views/Menu/section.html.twig
index 0d0b054ab..e27075aa7 100644
--- a/Resources/views/Menu/section.html.twig
+++ b/Resources/views/Menu/section.html.twig
@@ -19,13 +19,17 @@
 <li class="nav-link more"><a href="javascript:void(0)">Sections</a>
     <ul class="submenu width-15-em">
         {% for route in routes %}
-            <li><a href="{{ path(route.key, args ) }}">
-                {% spaceless %}
-                    {% for icon in route.icons %}
-                        <i class="fa fa-{{ icon }}"></i> 
-                    {% endfor %}
-                {% endspaceless %}
-                {{ route.label|trans }}</a></li>
+            <li>
+                <a href="{{ path(route.key, args ) }}" style="background-color:transparent;">
+                    <div style="background-color: #333333; width: calc(100% - 3em); float: left; text-align:center;">
+                    {{ route.label|trans }}</div>
+                    <div style="background-color: #333333; width: 3em; color: rgba(255, 255, 255, 0.7); text-align:center;width: 2em; float: left; margin-left:1px;">{% spaceless %}
+                        {% for icon in route.icons %}
+                            <i class="fa fa-{{ icon }}"></i> 
+                        {% endfor %}
+                    {% endspaceless %}</div>
+                </a>
+            </li>
         {% endfor %}
     </ul>
 </li>
\ No newline at end of file
diff --git a/Resources/views/Menu/user.html.twig b/Resources/views/Menu/user.html.twig
index 99f432fa8..f641e4828 100644
--- a/Resources/views/Menu/user.html.twig
+++ b/Resources/views/Menu/user.html.twig
@@ -16,7 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-<li class="nav-link more"><a href="javascript:void(0)">{{ app.user.username }}</a>
+<li class="nav-link more">
+	<a href="javascript:void(0)">
+		{{ 'Welcome' | trans }}
+		<b>{{ app.user.username }}</b>
+	</a>
     <ul class="submenu width-11-em">
         {% for route in routes %}
             <li><a href="{{ path(route.key, args ) }}"><i class="fa fa-{{ route.icon }}"></i> {{ route.label|trans }}</a></li>