Connexion and sign out user navbar style

app/assets/stylesheets/navbar.scss

@@ -65,11 +65,22 @@
       }
     }
 
+    #sign_in{
+      margin-top: 7px;
+      .btn{
+        float: right;
+        margin-right: 1.3em;
+      }
+    }
+
     #sign_out{
       height: 60px;
+
       .fa {
-        margin-left: 10%;
+        float: right;
-        margin-top: 3%;
+        width: 70px;
+        margin-top: 2%;
+        margin-right: 0.5em;
         font-size: 40px;
       }
     }
@@ -114,12 +125,6 @@
     margin-top: -18px;
     height: 70px;
   }
-  .btn{
-    //color: white;
-  }
-  .btn:hover{
-    //color: #aaaaaa;
-  }
 }
 
 #beta {

app/views/layouts/navbars/_navbar_default.html.haml

@@ -1,2 +1 @@
-.col-lg-2.col-md-2
+.col-lg-11.col-md-11
-  Default navbar

app/views/layouts/navbars/_navbar_log_options.html.haml

@@ -1,14 +1,15 @@
 -#%span.fa.fa-sign-out
 
 -if user_signed_in?
-  = render partial: 'users/login_banner'
+  .col-lg-1.col-md-1#sign_out.no-padding
+    = render partial: 'users/login_banner'
 -elsif gestionnaire_signed_in?
   .col-lg-1.col-md-1#sign_out.no-padding
     = render partial: 'gestionnaires/login_banner'
 -elsif administrateur_signed_in?
   = render partial: 'administrateurs/login_banner'
 -else
-  .col-lg-5.col-md-5
+  .col-lg-1.col-md-1#sign_in
-    = link_to "Connexion", '/users/sign_in', :class => 'btn btn-md'
+    = link_to "Connexion", '/users/sign_in', :class => 'btn btn-lg'
     -unless Features.unified_login
       = link_to "Accompagnateur", '/gestionnaires/sign_in', :class => 'btn btn-md'

app/views/users/_login_banner.html.haml

@@ -1,13 +1,10 @@
-%div.user
+-if current_user.loged_in_with_france_connect?
-  -if current_user.loged_in_with_france_connect?
+  %div{ id: "fconnect-profile", "data-fc-logout-url" => '/users/sign_out" data-method="delete' }
-    %div{ id: "fconnect-profile", "data-fc-logout-url" => '/users/sign_out" data-method="delete' }
+    %a.text-info{ href: "#" }
-      %a.text-info{ href: "#" }
+      = "#{current_user.given_name} #{current_user.family_name}"
-        = "#{current_user.given_name} #{current_user.family_name}"
 
-    = link_to "", '/users/sign_out', method: :delete, :class => 'btn fa fa-power-off off-fc-link'
+  = link_to "", '/users/sign_out', method: :delete, :class => 'btn fa fa-power-off off-fc-link'
 
-  -else
+-else
-    %i.fa.fa-user
+  = link_to "", '/users/sign_out', method: :delete, :class => 'btn btn-md fa fa-sign-out'
-    = current_user.email
 
-    = link_to "Déconnexion", '/users/sign_out', method: :delete, :class => 'btn btn-md'