Skip to content

Commit

Permalink
fix responsive
Browse files Browse the repository at this point in the history
  • Loading branch information
lisa-durand committed Feb 4, 2025
1 parent f443a31 commit d59eefd
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 11 deletions.
6 changes: 5 additions & 1 deletion app/assets/stylesheets/procedure_list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
}

> li {
border-top: 1px solid var(--border-default-grey);
border-top: none;

@media (min-width: 62em) {
border-top: 1px solid var(--border-default-grey);
}
}

.procedure-logo {
Expand Down
8 changes: 7 additions & 1 deletion app/views/instructeurs/procedures/_list.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,13 @@
%li
= link_to t('instructeurs.dossiers.header.banner.export_templates'), export_templates_instructeur_procedure_path(p), class: 'fr-nav__link'

%h3.font-weight-normal.fr-link.fr-mx-2w
.fr-hidden.fr-unhidden-lg
%h3.font-weight-normal.fr-link.fr-mx-2w
= link_to procedure_libelle_with_number(p), instructeur_procedure_path(p)
= procedure_badge(p)

.flex.align-center.fr-hidden-lg.fr-mb-2w
%h3.font-weight-normal.fr-link.fr-mr-2w
= link_to procedure_libelle_with_number(p), instructeur_procedure_path(p)
= procedure_badge(p)

Expand Down
12 changes: 6 additions & 6 deletions spec/system/instructeurs/instruction_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

expect(page).to have_current_path(instructeur_procedures_path)

click_on procedure.libelle
click_on(procedure.libelle, visible: true)
expect(page).to have_current_path(instructeur_procedure_path(procedure))

click_on dossier.user.email
Expand Down Expand Up @@ -83,7 +83,7 @@
# keep back up to date after most action on dossier
expect(page).to have_selector(".back-btn[href=\"#{instructeur_procedure_path(procedure, statut: 'suivis')}\"]")

click_on procedure.libelle
click_on(procedure.libelle, visible: true)
click_on 'traité'
expect(page).to have_button('Repasser en instruction')
click_on 'Mettre à la corbeille'
Expand All @@ -106,7 +106,7 @@
scenario 'A instructeur can follow/unfollow a dossier' do
log_in(instructeur.email, password)

click_on procedure.libelle
click_on(procedure.libelle, visible: true)
test_statut_bar(a_suivre: 1, tous_les_dossiers: 1)
dossier_present?(dossier.id, 'en construction')

Expand All @@ -130,7 +130,7 @@
log_in(instructeur.email, password)
end

click_on procedure.libelle
click_on(procedure.libelle, visible: true)
test_statut_bar(a_suivre: 1, tous_les_dossiers: 1)

click_on "Télécharger un dossier"
Expand Down Expand Up @@ -159,7 +159,7 @@

log_in(instructeur.email, password)

click_on procedure.libelle
click_on(procedure.libelle, visible: true)
click_on 'Suivre'
click_on 'suivi'
click_on dossier.user.email
Expand Down Expand Up @@ -191,7 +191,7 @@

log_in(instructeur.email, password)

click_on procedure.libelle
click_on(procedure.libelle, visible: true)
click_on dossier.user.email

click_on 'Personnes impliquées'
Expand Down
6 changes: 3 additions & 3 deletions spec/system/routing/rules_full_scenario_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@

# the litteraires instructeurs only manage the litteraires dossiers
register_instructeur_and_log_in(victor.email)
click_on procedure.libelle
click_on(procedure.libelle, visible: true)
expect(page).to have_text(litteraire_user.email)
expect(page).not_to have_text(scientifique_user.email)

Expand All @@ -176,7 +176,7 @@

# the scientifiques instructeurs only manage the scientifiques dossiers
register_instructeur_and_log_in(marie.email)
click_on procedure.libelle
click_on(procedure.libelle, visible: true)
expect(page).not_to have_text(litteraire_user.email)
expect(page).to have_text(scientifique_user.email)

Expand Down Expand Up @@ -209,7 +209,7 @@
expect(find('.procedure-stats')).to have_css('span.notifications')

## on the dossiers list
click_on procedure.libelle
click_on(procedure.libelle, visible: true)
expect(page).to have_current_path(instructeur_procedure_path(procedure))
expect(find('nav.fr-tabs')).to have_css('span.notifications')

Expand Down

0 comments on commit d59eefd

Please sign in to comment.