DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix html: Element div not allowed as child of element span

Browse source
This commit is contained in:
simon lehericey 2019-11-19 14:22:53 +01:00
parent 59432594a0
commit 279696451e
6 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/new_design/buttons.scss
View file

@ -130,6 +130,10 @@
} }
} }
.state-button {
display: inline-block;
}
.dropdown { .dropdown {
display: inline-block; display: inline-block;
position: relative; position: relative;

2
app/views/instructeurs/dossiers/_header_actions.html.haml
View file

@ -20,5 +20,5 @@
= render partial: "instructeurs/procedures/dossier_actions", locals: { procedure: dossier.procedure, dossier: dossier, dossier_is_followed: current_instructeur&.follow?(dossier) } = render partial: "instructeurs/procedures/dossier_actions", locals: { procedure: dossier.procedure, dossier: dossier, dossier_is_followed: current_instructeur&.follow?(dossier) }
%span.state-button .state-button
= render partial: "state_button", locals: { dossier: dossier } = render partial: "state_button", locals: { dossier: dossier }

2
app/views/instructeurs/dossiers/_state_button.html.haml
View file

@ -1,4 +1,4 @@
%span.dropdown .dropdown
-# Dropdown button title -# Dropdown button title
%button.button.primary.dropdown-button{ class: button_or_label_class(dossier) } %button.button.primary.dropdown-button{ class: button_or_label_class(dossier) }
= dossier_display_state dossier = dossier_display_state dossier

2
app/views/invites/_dropdown.html.haml
View file

@ -1,4 +1,4 @@
%span.dropdown.invite-user-action .dropdown.invite-user-action
%button.button.dropdown-button %button.button.dropdown-button
%span.icon.person %span.icon.person
- if dossier.invites.count > 0 - if dossier.invites.count > 0

2
app/views/layouts/_account_dropdown.haml
View file

@ -1,4 +1,4 @@
%span.dropdown.header-menu-opener .dropdown.header-menu-opener
%button.button.dropdown-button.header-menu-button %button.button.dropdown-button.header-menu-button
= image_tag "icons/account-circle.svg", title: "Mon compte" = image_tag "icons/account-circle.svg", title: "Mon compte"
%ul.header-menu.dropdown-content %ul.header-menu.dropdown-content

2
app/views/users/dossiers/_dossier_actions.html.haml
View file

@ -4,7 +4,7 @@
- has_actions = has_delete_action || has_new_dossier_action - has_actions = has_delete_action || has_new_dossier_action
- if has_actions - if has_actions
%span.dropdown.user-dossier-actions .dropdown.user-dossier-actions
%button.button.dropdown-button %button.button.dropdown-button
Actions Actions
.dropdown-content.fade-in-down .dropdown-content.fade-in-down