From fd3b30d8e6bdfa0c62997bf2857b65d58dace4a6 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Thu, 6 Oct 2022 14:25:54 +0200 Subject: [PATCH] style(messagerie): improve font-size & styles --- app/assets/stylesheets/message.scss | 6 ------ .../dossiers/message_component/message_component.html.haml | 6 +++--- app/views/instructeurs/dossiers/_header_actions.html.haml | 4 ++-- .../dossiers/_state_button_motivation.html.haml | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/message.scss b/app/assets/stylesheets/message.scss index a11507ede..488e3f516 100644 --- a/app/assets/stylesheets/message.scss +++ b/app/assets/stylesheets/message.scss @@ -25,12 +25,6 @@ font-weight: bold; } - .guest, - .date { - font-size: 12px; - color: $dark-grey; - } - .date { float: right; } diff --git a/app/components/dossiers/message_component/message_component.html.haml b/app/components/dossiers/message_component/message_component.html.haml index 1e75d85b4..980ef7398 100644 --- a/app/components/dossiers/message_component/message_component.html.haml +++ b/app/components/dossiers/message_component/message_component.html.haml @@ -1,12 +1,12 @@ = image_tag(icon_path, class: 'person-icon', alt: '') .width-100 - %h2 + %h2.fr-h6 %span.mail = commentaire_issuer - if commentaire_from_guest? - %span.guest= t('.guest') - %span.date{ class: highlight_if_unseen_class, data: scroll_to_target } + %span.fr-text--xs.fr-text-mention--grey.font-weight-normal= t('.guest') + %span.date{ class: ["fr-text--xs", "fr-text-mention--grey", "font-weight-normal", highlight_if_unseen_class], data: scroll_to_target } = commentaire_date .rich-text= commentaire_body diff --git a/app/views/instructeurs/dossiers/_header_actions.html.haml b/app/views/instructeurs/dossiers/_header_actions.html.haml index 88e3de189..9a03b37ce 100644 --- a/app/views/instructeurs/dossiers/_header_actions.html.haml +++ b/app/views/instructeurs/dossiers/_header_actions.html.haml @@ -1,6 +1,6 @@ %ul.fr-btns-group.fr-btns-group--sm.fr-btns-group--inline-md.fr-btns-group--icon-right %li.dropdown.print-menu-opener{ data: { controller: 'menu-button' } } - %button.fr-btn.fr-btn--secondary.fr-icon-printer-line.dropdown-button{ title: 'imprimer', 'aria-label': 'Imprimer', data: { menu_button_target: 'button' } } Imprimer + %button.fr-btn.fr-btn--tertiary.fr-icon-printer-line.dropdown-button{ title: 'imprimer', 'aria-label': 'Imprimer', data: { menu_button_target: 'button' } } Imprimer %ul#print-menu.print-menu.dropdown-content{ data: { menu_button_target: 'menu' } } %li = link_to "Tout le dossier", print_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link" @@ -13,7 +13,7 @@ = link_to "Export GeoJSON", geo_data_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link" %li.dropdown.print-menu-opener{ data: { controller: 'menu-button' } } - %button.fr-btn.fr-btn--secondary.fr-icon-download-line.dropdown-button{ data: { menu_button_target: 'button', 'aria-label': 'Télécharger' } } Télécharger + %button.fr-btn.fr-btn--tertiary.fr-icon-download-line.dropdown-button{ data: { menu_button_target: 'button', 'aria-label': 'Télécharger' } } Télécharger %ul#print-pj-menu.print-menu.dropdown-content{ data: { menu_button_target: 'menu' } } %li= link_to "Télécharger le dossier et toutes ses pièces jointes", telecharger_pjs_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link" diff --git a/app/views/instructeurs/dossiers/_state_button_motivation.html.haml b/app/views/instructeurs/dossiers/_state_button_motivation.html.haml index 46b55477d..4805192c5 100644 --- a/app/views/instructeurs/dossiers/_state_button_motivation.html.haml +++ b/app/views/instructeurs/dossiers/_state_button_motivation.html.haml @@ -1,5 +1,5 @@ .motivation.hidden{ class: popup_class } - %h3 + %h3.fr-h5 %span.icon{ class: popup_class } #{popup_title}