From 4fab477b6324d650d506cdabc3143377f4a44704 Mon Sep 17 00:00:00 2001 From: Simon Lehericey Date: Mon, 16 Oct 2017 10:29:33 +0200 Subject: [PATCH] Style: scope icon style --- app/assets/stylesheets/new_design/icons.scss | 2 +- .../avis/_avis_list.html.haml | 4 +- .../new_gestionnaire/avis/index.html.haml | 2 +- .../avis/instruction.html.haml | 4 +- .../dossiers/_header.html.haml | 2 +- .../dossiers/_state_button.html.haml | 16 +++---- .../dossiers/messagerie.html.haml | 2 +- .../procedures/_dossier_actions.html.haml | 8 ++-- .../procedures/show.html.haml | 2 +- .../recherches/index.html.haml | 2 +- app/views/root/patron.html.haml | 46 +++++++++---------- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/app/assets/stylesheets/new_design/icons.scss b/app/assets/stylesheets/new_design/icons.scss index 88de2c881..7c9d7818d 100644 --- a/app/assets/stylesheets/new_design/icons.scss +++ b/app/assets/stylesheets/new_design/icons.scss @@ -1,4 +1,4 @@ -i { +i.icon { display: inline-block; width: 24px; height: 24px; diff --git a/app/views/new_gestionnaire/avis/_avis_list.html.haml b/app/views/new_gestionnaire/avis/_avis_list.html.haml index a389fd5e5..0356906f4 100644 --- a/app/views/new_gestionnaire/avis/_avis_list.html.haml +++ b/app/views/new_gestionnaire/avis/_avis_list.html.haml @@ -14,12 +14,12 @@ - if avis.confidentiel? %span.confidentiel confidentiel - %i.lock{ title: "Cet avis n'est pas affiché avec les autres experts consultés" } + %i.icon.lock{ title: "Cet avis n'est pas affiché avec les autres experts consultés" } %span.date Demande d'avis envoyée le #{I18n.l(avis.created_at.localtime, format: '%d/%m/%y')} %p= avis.introduction .answer.flex.align-start - %i.bubble.avis-icon + %i.icon.bubble.avis-icon .width-100 %h2.gestionnaire = (avis.email_to_display == current_gestionnaire.email) ? 'Vous' : avis.email_to_display diff --git a/app/views/new_gestionnaire/avis/index.html.haml b/app/views/new_gestionnaire/avis/index.html.haml index 984db4f24..a4550d501 100644 --- a/app/views/new_gestionnaire/avis/index.html.haml +++ b/app/views/new_gestionnaire/avis/index.html.haml @@ -29,7 +29,7 @@ %tr %td.number-col = link_to(avis_path(avis), class: 'cell-link') do - %i.folder + %i.icon.folder #{avis.dossier.id} %td= link_to(avis.dossier.user.email, avis_path(avis), class: 'cell-link') %td= link_to(avis.dossier.procedure.libelle, avis_path(avis), class: 'cell-link') diff --git a/app/views/new_gestionnaire/avis/instruction.html.haml b/app/views/new_gestionnaire/avis/instruction.html.haml index 53c4dd8e7..2133512a6 100644 --- a/app/views/new_gestionnaire/avis/instruction.html.haml +++ b/app/views/new_gestionnaire/avis/instruction.html.haml @@ -14,7 +14,7 @@ = f.text_area :answer, rows: 3, placeholder: 'Votre avis', required: true .flex.justify-between.align-baseline %p.confidentiel - %i.lock + %i.icon.lock Cet avis est confidentiel et n'est pas affiché aux autres experts consultés .send-wrapper = f.submit 'Envoyer votre avis', class: 'button send' @@ -29,7 +29,7 @@ .flex.justify-between.align-baseline - if @avis.confidentiel? %p.confidentiel - %i.lock + %i.icon.lock Cet avis est confidentiel et n'est pas affiché aux autres experts consultés .send-wrapper = f.submit 'Demander un avis', class: 'button send' diff --git a/app/views/new_gestionnaire/dossiers/_header.html.haml b/app/views/new_gestionnaire/dossiers/_header.html.haml index 7104642d0..3b1ef75ad 100644 --- a/app/views/new_gestionnaire/dossiers/_header.html.haml +++ b/app/views/new_gestionnaire/dossiers/_header.html.haml @@ -8,7 +8,7 @@ = "Dossier nº #{dossier.id}" %div = link_to print_dossier_path(dossier.procedure, dossier), target: "_blank", class: "button icon-only" do - %i.printer> + %i.icon.printer> = render partial: "new_gestionnaire/procedures/dossier_actions", locals: { procedure: dossier.procedure, dossier: dossier, dossier_is_followed: current_gestionnaire&.follow?(dossier) } = render partial: "state_button", locals: { dossier: dossier } %ul.tabs diff --git a/app/views/new_gestionnaire/dossiers/_state_button.html.haml b/app/views/new_gestionnaire/dossiers/_state_button.html.haml index 7584cd95d..3901fe487 100644 --- a/app/views/new_gestionnaire/dossiers/_state_button.html.haml +++ b/app/views/new_gestionnaire/dossiers/_state_button.html.haml @@ -5,13 +5,13 @@ %ul.dropdown-items - if dossier.en_construction? %li.selected - %i.edit + %i.icon.edit .description %h4 En construction Vous permettez à l'usager de modifier ses réponses au formulaire %li = link_to backoffice_dossier_receive_path(dossier, new_ui: true), method: :post, data: { confirm: "Confirmer vous le passage en instruction de ce dossier ?" } do - %i.in-progress + %i.icon.in-progress .description %h4 Passer en instruction L'usager ne pourra plus modifier le formulaire @@ -19,35 +19,35 @@ - if dossier.en_instruction? %li = link_to backoffice_dossier_reopen_path(dossier, new_ui: true), method: :post, data: { confirm: "Confirmer vous la réouverture de ce dossier ?" } do - %i.edit + %i.icon.edit .description %h4 Repasser en construction Vous permettrez à l'usager de modifier ses réponses au formulaire %li.selected - %i.in-progress + %i.icon.in-progress .description %h4 En instruction L'usager ne peut modifer son dossier pendant l'instruction %li{ onclick: "TPS.acceptDossier();" } - %i.accept + %i.icon.accept .description %h4 Accepter L'usager sera notifié que son dossier a été accepté %li = link_to backoffice_dossier_process_dossier_path(dossier, process_action: "without_continuation", new_ui: true), method: :post, data: { confirm: "Confirmer vous le classement sans suite de ce dossier ?" } do - %i.without-continuation + %i.icon.without-continuation .description %h4 Classer sans suite L'usager ne recevra aucune notification %li = link_to backoffice_dossier_process_dossier_path(dossier, process_action: "refuse", new_ui: true), method: :post, data: { confirm: "Confirmer vous le refus de ce dossier ?" } do - %i.close + %i.icon.close .description %h4 Refuser L'usager sera notifié que son dossier a été refusé .motivation %h3 - %i.accept + %i.icon.accept Accepter le dossier = "nº #{dossier.id}" diff --git a/app/views/new_gestionnaire/dossiers/messagerie.html.haml b/app/views/new_gestionnaire/dossiers/messagerie.html.haml index a3cc9e339..604633761 100644 --- a/app/views/new_gestionnaire/dossiers/messagerie.html.haml +++ b/app/views/new_gestionnaire/dossiers/messagerie.html.haml @@ -17,7 +17,7 @@ - if file = commentaire.piece_justificative .attachment-link = link_to file.content_url, class: "button", target: "_blank", title: "Télécharger" do - %i.attachment + %i.icon.attachment = file.original_filename = form_for(Commentaire.new, url: commentaire_dossier_path(@dossier.procedure, @dossier), html: { class: 'form' }) do |f| diff --git a/app/views/new_gestionnaire/procedures/_dossier_actions.html.haml b/app/views/new_gestionnaire/procedures/_dossier_actions.html.haml index 48c3bb000..01e413fb7 100644 --- a/app/views/new_gestionnaire/procedures/_dossier_actions.html.haml +++ b/app/views/new_gestionnaire/procedures/_dossier_actions.html.haml @@ -1,19 +1,19 @@ - if dossier.en_construction_ou_instruction? - if dossier_is_followed = link_to unfollow_dossier_path(procedure, dossier), method: :patch, class: 'button' do - %i.unfollow> + %i.icon.unfollow> Ne plus suivre - else = link_to follow_dossier_path(procedure, dossier), method: :patch, class: 'button' do - %i.follow> + %i.icon.follow> Suivre le dossier - elsif dossier.termine? - if dossier.archived = link_to unarchive_dossier_path(procedure, dossier), method: :patch, class: 'button' do - %i.unarchive> + %i.icon.unarchive> Désarchiver le dossier - else = link_to archive_dossier_path(procedure, dossier), method: :patch, class: 'button' do - %i.archive> + %i.icon.archive> Archiver le dossier diff --git a/app/views/new_gestionnaire/procedures/show.html.haml b/app/views/new_gestionnaire/procedures/show.html.haml index 1273f1164..0a5335727 100644 --- a/app/views/new_gestionnaire/procedures/show.html.haml +++ b/app/views/new_gestionnaire/procedures/show.html.haml @@ -98,7 +98,7 @@ %tr %td.number-col = link_to(dossier_path(@procedure, dossier), class: 'cell-link') do - %i.folder + %i.icon.folder - if @followed_dossiers.with_unread_notifications.include?(dossier) %span.notifications{ 'aria-label': 'notifications' } = dossier.id diff --git a/app/views/new_gestionnaire/recherches/index.html.haml b/app/views/new_gestionnaire/recherches/index.html.haml index 0c665ac1d..528dcc9db 100644 --- a/app/views/new_gestionnaire/recherches/index.html.haml +++ b/app/views/new_gestionnaire/recherches/index.html.haml @@ -16,7 +16,7 @@ %tr %td.number-col = link_to(dossier_path(dossier.procedure, dossier), class: 'cell-link') do - %i.folder> + %i.icon.folder> = dossier.id %td= link_to(dossier.procedure.libelle, dossier_path(dossier.procedure, dossier), class: 'cell-link') %td= link_to(dossier.user.email, dossier_path(dossier.procedure, dossier), class: 'cell-link') diff --git a/app/views/root/patron.html.haml b/app/views/root/patron.html.haml index e98c59d2d..bb828eaf6 100644 --- a/app/views/root/patron.html.haml +++ b/app/views/root/patron.html.haml @@ -2,20 +2,20 @@ .container %h1 Icones - %i.follow - %i.unfollow - %i.archive - %i.unarchive - %i.folder - %i.accept - %i.close - %i.without-continuation - %i.edit - %i.in-progress - %i.bubble - %i.attachment - %i.lock - %i.printer + %i.icon.follow + %i.icon.unfollow + %i.icon.archive + %i.icon.unarchive + %i.icon.folder + %i.icon.accept + %i.icon.close + %i.icon.without-continuation + %i.icon.edit + %i.icon.in-progress + %i.icon.bubble + %i.icon.attachment + %i.icon.lock + %i.icon.printer %h1 Formulaires @@ -48,17 +48,17 @@ %p = link_to "#", class: "button" do - %i.follow - = "%i.follow" + %i.icon.follow + = "%i.icon.follow" = link_to "#", class: "button" do - %i.unfollow - = "%i.unfollow" + %i.icon.unfollow + = "%i.icon.unfollow" = link_to "#", class: "button" do - %i.archive - = "%i.archive" + %i.icon.archive + = "%i.icon.archive" = link_to "#", class: "button" do - %i.unarchive - = "%i.unarchive" + %i.icon.unarchive + = "%i.icon.unarchive" %p = link_to ".button.primary.expand", "#", class: "button primary expand" @@ -191,7 +191,7 @@ %p Bonjour, merci de me donner votre avis sur ce dossier. .answer.flex.align-start - %i.bubble.avis-icon + %i.icon.bubble.avis-icon .width-100 %h2.gestionnaire gestionnnaire@tps.com