From c2fbb246e72f898e362a1ff04f1d3380284f20c1 Mon Sep 17 00:00:00 2001 From: Xavier J Date: Tue, 8 Dec 2015 18:34:43 +0100 Subject: [PATCH] beta tag --- app/assets/stylesheets/application.scss | 34 ++++++++++++++++++++---- app/views/layouts/application.html.haml | 35 ++++++++++++++----------- 2 files changed, 48 insertions(+), 21 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 6adc0ee53..9c0c1c595 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -32,6 +32,31 @@ body { 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-danger { margin-top: -20px @@ -129,19 +154,18 @@ div.pagination { border-bottom-right-radius: 0; } -.btn-nav.text-info:hover{ +.btn-nav.text-info:hover { color: #23527c; } -.btn-nav.text-success:hover{ +.btn-nav.text-success:hover { color: #3c763d; } -.btn-nav.text-danger:hover{ +.btn-nav.text-danger:hover { color: #a94442; } - #confirm { - display:none; + display: none; } \ No newline at end of file diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 4ccafd86b..a01705e12 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -8,29 +8,32 @@ = javascript_include_tag 'application', 'data-turbolinks-track' => true = csrf_meta_tags %body + #beta + Beta %div %div.navbar = image_tag('marianne_small.png', class: 'logo') %a{href: '/', class:'btn btn-lg'} ='TPS' - -if gestionnaire_signed_in? - %div{style: 'decorate:none; box-shadow:none; float:right; margin-top:8px'} - = current_gestionnaire.email - = link_to "Déconnexion", '/gestionnaires/sign_out', method: :delete, :class => 'btn btn-md' - -elsif administrateur_signed_in? - %div{style: 'decorate:none; box-shadow:none; float:right; margin-top:8px'} - = current_administrateur.email - = link_to "Déconnexion", '/administrateurs/sign_out', method: :delete, :class => 'btn btn-md' + #sign_out + -if gestionnaire_signed_in? + %div + = current_gestionnaire.email + = link_to "Déconnexion", '/gestionnaires/sign_out', method: :delete, :class => 'btn btn-md' + -elsif administrateur_signed_in? + %div + = current_administrateur.email + = link_to "Déconnexion", '/administrateurs/sign_out', method: :delete, :class => 'btn btn-md' - - elsif user_signed_in? - %div.user{style: 'decorate:none; box-shadow:none; float:right; margin-top:8px'} - -if current_user.loged_in_with_france_connect - = image_tag('logo_FC_02_small.png', class: 'logo_fc_small') - -else - %i.fa.fa-user - = current_user.email - = link_to "Déconnexion", '/users/sign_out', method: :delete, :class => 'btn btn-md' + - elsif user_signed_in? + %div.user + -if current_user.loged_in_with_france_connect + = image_tag('logo_FC_02_small.png', class: 'logo_fc_small') + -else + %i.fa.fa-user + = current_user.email + = link_to "Déconnexion", '/users/sign_out', method: :delete, :class => 'btn btn-md' #flash_message.center - if flash.notice