From 04a451345286b522301eade2a8dd24eaf54831db Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Wed, 13 Mar 2019 11:35:26 +0100 Subject: [PATCH] stylesheet: rename `.description` to `.dropdown-description` --- app/assets/stylesheets/new_design/buttons.scss | 2 +- .../dossiers/_state_button.html.haml | 14 +++++++------- app/views/root/patron.html.haml | 14 ++++++++++++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/new_design/buttons.scss b/app/assets/stylesheets/new_design/buttons.scss index f7ec5243a..b228b8cc6 100644 --- a/app/assets/stylesheets/new_design/buttons.scss +++ b/app/assets/stylesheets/new_design/buttons.scss @@ -232,7 +232,7 @@ flex-shrink: 0; } - div { + .dropdown-description { padding-left: $default-spacer; } } diff --git a/app/views/new_gestionnaire/dossiers/_state_button.html.haml b/app/views/new_gestionnaire/dossiers/_state_button.html.haml index 3ca3b92f9..c28254ca0 100644 --- a/app/views/new_gestionnaire/dossiers/_state_button.html.haml +++ b/app/views/new_gestionnaire/dossiers/_state_button.html.haml @@ -7,13 +7,13 @@ - if dossier.en_construction? %li.selected %span.icon.edit - .description + .dropdown-description %h4 En construction Vous permettez à l'usager de modifier ses réponses au formulaire %li = link_to passer_en_instruction_gestionnaire_dossier_path(dossier.procedure, dossier), method: :post, data: { remote: true, confirm: "Confirmer vous le passage en instruction de ce dossier ?" } do %span.icon.in-progress - .description + .dropdown-description %h4 Passer en instruction L'usager ne pourra plus modifier le formulaire @@ -21,30 +21,30 @@ %li = link_to repasser_en_construction_gestionnaire_dossier_path(dossier.procedure, dossier), method: :post, data: { remote:true, confirm: "Confirmer vous le passage en construction de ce dossier ?" } do %span.icon.edit - .description + .dropdown-description %h4 Repasser en construction Vous permettrez à l'usager de modifier ses réponses au formulaire %li.selected %span.icon.in-progress - .description + .dropdown-description %h4 En instruction L'usager ne peut modifier son dossier pendant l'instruction %li %a{ href: '#', onclick: "DS.showMotivation(event, 'accept');" } %span.icon.accept - .description + .dropdown-description %h4 Accepter L'usager sera notifié que son dossier a été accepté %li %a{ href: '#', onclick: "DS.showMotivation(event, 'without-continuation');" } %span.icon.without-continuation - .description + .dropdown-description %h4 Classer sans suite L'usager sera notifié que son dossier a été classé sans suite %li %a{ href: '#', onclick: "DS.showMotivation(event, 'refuse');" } %span.icon.refuse - .description + .dropdown-description %h4 Refuser L'usager sera notifié que son dossier a été refusé = render partial: 'new_gestionnaire/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Accepter le dossier', placeholder: 'Expliquez au demandeur pourquoi ce dossier est accepté (facultatif)', popup_class: 'accept', process_action: 'accepter', title: 'Accepter', confirm: "Confirmez-vous l'acceptation ce dossier ?" } diff --git a/app/views/root/patron.html.haml b/app/views/root/patron.html.haml index 322403e00..acc9d8012 100644 --- a/app/views/root/patron.html.haml +++ b/app/views/root/patron.html.haml @@ -105,8 +105,18 @@ .button.dropdown-button .button.dropdown-button .dropdown-content.fade-in-down %ul.dropdown-items - %li .dropdown-content ul.dropdown-items li - %li .dropdown-content ul.dropdown-items li + %li + %a{ href: '#' } + %span.icon.mail + .dropdown-description + %h4 Action + %p Explanation + %li + %a{ href: '#' } + %span.icon.edit + .dropdown-description + %h4 Other action + %p Explanation .dropdown .button.dropdown-button .button.dropdown-button (left)