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

beta tag

Browse source
This commit is contained in:
Xavier J 2015-12-08 18:34:43 +01:00
parent 6a471fe867
commit c2fbb246e7
2 changed files with 48 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/assets/stylesheets/application.scss
View file

@ -32,6 +32,31 @@ body {
max-height: 100%; max-height: 100%;
} }
#beta {
text-align: center;
text-transform: uppercase;
position: absolute;
top: 26px;
right: -35px;
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
width: 150px;
background-color: #008cba;
color: #fff;
padding: 5px;
font-size: 15px;
font-weight: 700;
z-index: 10;
}
#sign_out {
decorate: none;
box-shadow: none;
float: right;
margin-top: 8px;
margin-right: 80px;
}
.alert.alert-success, .alert.alert-success,
.alert.alert-danger { .alert.alert-danger {
margin-top: -20px margin-top: -20px
@ -129,19 +154,18 @@ div.pagination {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.btn-nav.text-info:hover{ .btn-nav.text-info:hover {
color: #23527c; color: #23527c;
} }
.btn-nav.text-success:hover{ .btn-nav.text-success:hover {
color: #3c763d; color: #3c763d;
} }
.btn-nav.text-danger:hover{ .btn-nav.text-danger:hover {
color: #a94442; color: #a94442;
} }
#confirm { #confirm {
display:none; display: none;
} }

35
app/views/layouts/application.html.haml
View file

@ -8,29 +8,32 @@
= javascript_include_tag 'application', 'data-turbolinks-track' => true = javascript_include_tag 'application', 'data-turbolinks-track' => true
= csrf_meta_tags = csrf_meta_tags
%body %body
#beta
Beta
%div %div
%div.navbar %div.navbar
= image_tag('marianne_small.png', class: 'logo') = image_tag('marianne_small.png', class: 'logo')
%a{href: '/', class:'btn btn-lg'} %a{href: '/', class:'btn btn-lg'}
='TPS' ='TPS'
-if gestionnaire_signed_in? #sign_out
%div{style: 'decorate:none; box-shadow:none; float:right; margin-top:8px'} -if gestionnaire_signed_in?
= current_gestionnaire.email %div
= link_to "Déconnexion", '/gestionnaires/sign_out', method: :delete, :class => 'btn btn-md' = current_gestionnaire.email
-elsif administrateur_signed_in? = link_to "Déconnexion", '/gestionnaires/sign_out', method: :delete, :class => 'btn btn-md'
%div{style: 'decorate:none; box-shadow:none; float:right; margin-top:8px'} -elsif administrateur_signed_in?
= current_administrateur.email %div
= link_to "Déconnexion", '/administrateurs/sign_out', method: :delete, :class => 'btn btn-md' = current_administrateur.email
= link_to "Déconnexion", '/administrateurs/sign_out', method: :delete, :class => 'btn btn-md'
- elsif user_signed_in? - elsif user_signed_in?
%div.user{style: 'decorate:none; box-shadow:none; float:right; margin-top:8px'} %div.user
-if current_user.loged_in_with_france_connect -if current_user.loged_in_with_france_connect
= image_tag('logo_FC_02_small.png', class: 'logo_fc_small') = image_tag('logo_FC_02_small.png', class: 'logo_fc_small')
-else -else
%i.fa.fa-user %i.fa.fa-user
= current_user.email = current_user.email
= link_to "Déconnexion", '/users/sign_out', method: :delete, :class => 'btn btn-md' = link_to "Déconnexion", '/users/sign_out', method: :delete, :class => 'btn btn-md'
#flash_message.center #flash_message.center
- if flash.notice - if flash.notice