Connexion and sign out user navbar style

This commit is contained in:
Xavier J 2016-12-01 13:01:00 +01:00
parent b779c71cb6
commit bca0292fc4
4 changed files with 25 additions and 23 deletions

View file

@ -65,11 +65,22 @@
}
}
#sign_in{
margin-top: 7px;
.btn{
float: right;
margin-right: 1.3em;
}
}
#sign_out{
height: 60px;
.fa {
margin-left: 10%;
margin-top: 3%;
float: right;
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 {

View file

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

View file

@ -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
= link_to "Connexion", '/users/sign_in', :class => 'btn btn-md'
.col-lg-1.col-md-1#sign_in
= link_to "Connexion", '/users/sign_in', :class => 'btn btn-lg'
-unless Features.unified_login
= link_to "Accompagnateur", '/gestionnaires/sign_in', :class => 'btn btn-md'

View file

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