DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Connexion and sign out user navbar style

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/assets/stylesheets/navbar.scss
View file

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

3
app/views/layouts/navbars/_navbar_default.html.haml
View file

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

5
app/views/layouts/navbars/_navbar_log_options.html.haml
View file

@ -1,6 +1,7 @@
-#%span.fa.fa-sign-out -#%span.fa.fa-sign-out
-if user_signed_in? -if user_signed_in?
.col-lg-1.col-md-1#sign_out.no-padding
= render partial: 'users/login_banner' = render partial: 'users/login_banner'
-elsif gestionnaire_signed_in? -elsif gestionnaire_signed_in?
.col-lg-1.col-md-1#sign_out.no-padding .col-lg-1.col-md-1#sign_out.no-padding
@ -8,7 +9,7 @@
-elsif administrateur_signed_in? -elsif administrateur_signed_in?
= render partial: 'administrateurs/login_banner' = render partial: 'administrateurs/login_banner'
-else -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 -unless Features.unified_login
= link_to "Accompagnateur", '/gestionnaires/sign_in', :class => 'btn btn-md' = link_to "Accompagnateur", '/gestionnaires/sign_in', :class => 'btn btn-md'

5
app/views/users/_login_banner.html.haml
View file

@ -1,4 +1,3 @@
%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: "#" }
@ -7,7 +6,5 @@
= 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'