decidim-proposals 0.27.8 → 0.28.0.rc4

data/app/views/decidim/proposals/admin/proposal_answers/_form.html.erb

@@ -1,12 +1,17 @@
-<%= decidim_form_for(@answer_form, url: proposal_proposal_answer_path(proposal, @answer_form), html: { class: "form edit_proposal_answer" }) do |f| %>
-  <div class="card" id="proposal-answer">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title", title: present(proposal).title %></h2>
-    </div>
+<%= decidim_form_for(@answer_form, url: proposal_proposal_answer_path(proposal, @answer_form), html: { class: "form form-defaults edit_proposal_answer" }) do |f| %>
+  <div class="form__wrapper">
+    <div class="card" id="proposal-answer">
+      <div class="card-divider">
+        <h2 class="card-title"><%= t ".title", title: present(proposal).title %></h2>
+      </div>
 
-    <div class="card-section">
-      <div class="row column">
-        <%= f.collection_radio_buttons :internal_state, [["not_answered", t(".not_answered")], ["accepted", t(".accepted")], ["rejected", t(".rejected")], ["evaluating", t(".evaluating")]], :first, :last, prompt: true %>
+      <% if defined?(Decidim::Templates) %>
+        <%= render "decidim/templates/admin/proposal_answer_templates/template_chooser", form: f %>
+      <% end %>
+
+      <div class="row column flex items-center gap-x-4 my-2">
+        <%= f.collection_radio_buttons :internal_state, [["not_answered", t(".not_answered")], ["accepted", t(".accepted")], ["rejected", t(".rejected")], ["evaluating", t(".evaluating")]], :first, :last, prompt: true do |builder|
+              builder.label { builder.radio_button + builder.text } end %>
       </div>
 
       <div class="row column">
@@ -28,8 +33,9 @@
       <% end %>
     </div>
   </div>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".answer_proposal") %>
+  <div class="item__edit-sticky">
+    <div class="item__edit-sticky-container">
+      <%= f.submit t(".answer_proposal"), class: "button button__sm button__secondary" %>
+    </div>
   </div>
 <% end %>

data/app/views/decidim/proposals/admin/proposal_notes/_form.html.erb

@@ -1,8 +1,7 @@
-<%= decidim_form_for(@notes_form, url: proposal_proposal_notes_path(proposal, @notes_form), html: { class: "form new_proposal_note" }) do |f| %>
-  <div class="row column">
-    <%= f.text_area :body, rows: 10, label: t(".note") %>
-  </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".submit") %>
+<%= decidim_form_for(@notes_form, url: proposal_proposal_notes_path(proposal, @notes_form), html: { class: "form form-defaults new_proposal_note" }) do |f| %>
+  <div class="form__wrapper">
+    <%= f.text_area :body, rows: 4, label: t(".note"), class: "rounded border border-text-gray-2 mt-2" %>
   </div>
+
+  <%= f.submit t(".submit"), class: "button button__sm button__secondary" %>
 <% end %>

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb

@@ -1,45 +1,37 @@
-<section class="comments">
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t("title", scope: "decidim.proposals.admin.proposal_notes") %></h2>
-    </div>
-
-    <div class="card-section">
-      <div class="comment-thread">
-        <% proposal.notes.each do |note| %>
-          <div class="card">
-            <div class="card-divider">
-              <div class="comment">
-                <div class="comment__header">
-                  <div class="author-data">
-                    <div class="author-data__main">
-                      <div class="author author--inline">
-                        <strong><span class="author__name"><%= note.author.name %></span></strong>
-                        <span><%= l note.created_at, format: :decidim_short %></span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div class="comment__content">
-                  <%= simple_format note.body %>
+<div class="component__show_notes" data-component="accordion" id="accordion-notes">
+  <button class="card-divider-button" data-controls="panel-notes" type="button">
+    <%= icon "arrow-right-s-line" %>
+    <h2 class="card-title">
+      <%= t("title", scope: "decidim.proposals.admin.proposal_notes") %>
+    </h2>
+  </button>
+  <div id="panel-notes">
+    <div class="component__show_notes-grid">
+      <% proposal.notes.each do |note| %>
+        <div class="comment">
+          <div class="comment__header">
+            <div class="author-data">
+              <div class="author-data__main">
+                <div class="author author--inline">
+                  <strong><span class="author__name"><%= note.author.name %></span></strong>
+                  <span><%= l note.created_at, format: :decidim_short %></span>
                 </div>
               </div>
             </div>
           </div>
-        <% end %>
-      </div>
-    </div>
-    <div class="card-section">
-      <div class="add-comment">
-        <div class="card">
-          <div class="card-divider">
-            <h2 class="card-title"><%= t("leave_your_note", scope: "decidim.proposals.admin.proposal_notes") %></h2>
-          </div>
-          <div class="card-section">
-            <%= render "decidim/proposals/admin/proposal_notes/form" %>
+          <div class="comment__content">
+            <%= simple_format note.body %>
           </div>
         </div>
+      <% end %>
+    </div>
+    <div class="card add-comment">
+      <div class="card-divider">
+        <h2 class="card-title"><%= t("leave_your_note", scope: "decidim.proposals.admin.proposal_notes") %></h2>
+      </div>
+      <div class="card-section">
+        <%= render "decidim/proposals/admin/proposal_notes/form" %>
       </div>
     </div>
   </div>
-</section>
+</div>

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -1,38 +1,35 @@
-<div class="flex--cc flex-gap--1">
+<div class="flex align-middle gap-x-4 ml-auto" id="js-other-actions-wrapper">
   <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/dropdown" %>
+  <% if component_settings.participatory_texts_enabled? %>
+    <%= link_to t("actions.participatory_texts", scope: "decidim.proposals"), participatory_texts_path, id: "participatory_texts", class: "button button__sm button__secondary" %>
+  <% end %>
 
-  <div id="js-other-actions-wrapper">
-    <% if component_settings.participatory_texts_enabled? %>
-      <%= link_to t("actions.participatory_texts", scope: "decidim.proposals"), participatory_texts_path, id: "participatory_texts", class: "button tiny button--simple" %>
-    <% end %>
-
-    <% if allowed_to? :export, :proposals %>
-      <%= export_dropdown %>
-    <% end %>
+  <% if allowed_to? :export, :proposals %>
+    <%= export_dropdowns(query) %>
+  <% end %>
 
-    <% if allowed_to? :import, :proposals %>
-      <%= import_dropdown do %>
-        <li class="imports--component imports--proposals">
-          <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path %>
+  <% if allowed_to? :import, :proposals %>
+    <%= import_dropdown do %>
+      <li class="imports--component imports--proposals">
+        <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path %>
+      </li>
+      <% current_component.manifest.import_manifests.each do |import_manifest| %>
+        <li class="imports--file imports--<%= import_manifest.name %>">
+          <%= link_to import_manifest.message(:label, self), admin_imports_path(current_component, name: import_manifest.name) %>
         </li>
-        <% current_component.manifest.import_manifests.each do |import_manifest| %>
-          <li class="imports--file imports--<%= import_manifest.name %>">
-            <%= link_to import_manifest.message(:label, self), admin_imports_path(current_component, name: import_manifest.name) %>
-          </li>
-        <% end %>
       <% end %>
     <% end %>
+  <% end %>
 
-    <% if allowed_to? :create, :proposal %>
-      <%= link_to t("actions.new", scope: "decidim.proposals"), new_proposal_path, class: "button tiny button--simple" %>
-    <% end %>
-  </div>
-
-  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/recategorize" %>
-  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/scope-change" %>
-  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/merge" %>
-  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/split" %>
-  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/assign_to_valuator" %>
-  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_valuator" %>
-  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/publish_answers" %>
+  <% if allowed_to? :create, :proposal %>
+    <%= link_to t("actions.new", scope: "decidim.proposals"), new_proposal_path, class: "button button__sm button__secondary" %>
+  <% end %>
 </div>
+
+<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/recategorize" %>
+<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/scope-change" %>
+<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/merge" %>
+<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/split" %>
+<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/assign_to_valuator" %>
+<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_valuator" %>
+<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/publish_answers" %>

data/app/views/decidim/proposals/admin/proposals/_documents.html.erb

@@ -0,0 +1,13 @@
+<div class="card-section">
+  <div class="row column">
+    <strong><%= t "documents", scope: "decidim.proposals.admin.proposals.show" %>:</strong>
+    <ul id="documents">
+      <% proposal.documents.each do |document| %>
+        <li>
+          <%= link_to translated_attribute(document.title), document.url %>
+          <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/views/decidim/proposals/admin/proposals/_endorsers.html.erb

@@ -0,0 +1,25 @@
+<div class="card-section">
+  <div class="row column">
+    <span class="component__show-title"><%= t "endorsers", scope: "decidim.proposals.admin.proposals.show" %></span>
+    <ul id="proposal-endorsers-list">
+      <% presented_endorsers.first(5).each do |presented_endorser| %>
+        <li>
+          <%= link_to_if(
+                presented_endorser.profile_path.present?,
+                presented_endorser.name,
+                presented_endorser.profile_path,
+                target: :blank
+              ) %>
+        </li>
+      <% end %>
+      <% if presented_endorsers.count > 5 %>
+        <li>
+          <%= link_to(
+                t("n_more_endorsers", scope: "decidim.proposals.admin.proposals.show", count: presented_endorsers.count - 5),
+                resource_locator(proposal).path
+              ) %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/views/decidim/proposals/admin/proposals/_form.html.erb

@@ -1,101 +1,81 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column hashtags__container">
-      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
-    </div>
-
-    <div class="row column hashtags__container">
-      <%= form.translated :editor, :body, hashtaggable: true %>
-    </div>
-
-    <% if @form.component_automatic_hashtags.any? %>
-      <div class="field">
-        <%= form.label :automatic_hashtags %>
-        <div class="checkboxes hashtags">
-          <% @form.component_automatic_hashtags.each do |hashtag| %>
-            <label>
-              <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
-            </label>
-          <% end %>
-        </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column hashtags__container pb-4">
+        <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
       </div>
-    <% end %>
-
-    <% if @form.component_suggested_hashtags.any? %>
-      <div class="field">
-        <%= form.label :suggested_hashtags %>
-        <div class="checkboxes hashtags">
-          <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map {|hashtag| [hashtag.downcase, "##{hashtag}"]}, :first, :last do |option|
-            option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
-          end %>
-        </div>
+      <div class="row column hashtags__container">
+        <%= form.translated :editor, :body, hashtaggable: true, aria: { label: :body } %>
       </div>
-    <% end %>
-
-    <% if @form.meetings %>
-      <div class="meeting-fields">
+      <% if @form.component_automatic_hashtags.any? %>
+        <div class="field">
+          <%= form.label :automatic_hashtags %>
+          <div class="checkboxes hashtags">
+            <% @form.component_automatic_hashtags.each do |hashtag| %>
+              <label>
+                <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
+              </label>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+      <% if @form.component_suggested_hashtags.any? %>
+        <div class="field">
+          <%= form.label :suggested_hashtags %>
+          <div class="checkboxes hashtags">
+            <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|
+                option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
+              end %>
+          </div>
+        </div>
+      <% end %>
+      <% if @form.meetings %>
+        <div class="meeting-fields">
+          <div class="row column">
+            <%= form.check_box :created_in_meeting, label: t(".created_in_meeting") %>
+          </div>
+          <div class="row column" id="proposal_meeting">
+            <%= form.select :meeting_id,
+                            options_for_select(@form.meetings&.map { |meeting| [present(meeting).title(html_escape: true), meeting.id] }, selected: meetings_as_authors_selected ),
+                            { include_blank: true, label: t(".select_a_meeting") },
+                            { multiple: false, class: "chosen-select" } %>
+          </div>
+        </div>
+      <% end %>
+      <% if @form.geocoding_enabled? %>
+        <div class="row column">
+          <%= form.geocoding_field :address %>
+        </div>
+      <% end %>
+      <% if @form.categories&.any? %>
         <div class="row column">
-          <%= form.check_box :created_in_meeting, label: t(".created_in_meeting") %>
+          <%= form.categories_select :category_id, @form.categories, include_blank: t(".select_a_category") %>
         </div>
-
-        <div class="row column" id="proposal_meeting">
-          <%= form.select :meeting_id,
-                          options_for_select(@form.meetings&.map { |meeting| [present(meeting).title(html_escape: true), meeting.id] }, selected: meetings_as_authors_selected ),
-                          { include_blank: true, label: t(".select_a_meeting") },
-                          { multiple: false, class: "chosen-select" } %>
+      <% end %>
+      <% if current_component.has_subscopes? %>
+        <div class="row column">
+          <%= scopes_select_field form, :scope_id, root: current_component.scope %>
         </div>
-      </div>
-    <% end %>
-
-    <% if @form.geocoding_enabled? %>
-      <div class="row column">
-        <%= form.geocoding_field :address %>
-      </div>
-    <% end %>
-
-    <% if @form.categories&.any? %>
-      <div class="row column">
-        <%= form.categories_select :category_id, @form.categories, include_blank: t(".select_a_category") %>
-      </div>
-    <% end %>
-
-    <% if current_component.has_subscopes? %>
-      <div class="row column">
-        <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
-      </div>
-    <% end %>
-
-    <% if component_settings.attachments_allowed? %>
-      <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %>
-    <% end %>
-
-    <% if component_settings.attachments_allowed? %>
-      <div class="row column">
-        <fieldset>
+      <% end %>
+      <% if component_settings.attachments_allowed? %>
+        <%= render partial: "decidim/admin/shared/gallery", locals: { form: } %>
+      <% end %>
+      <% if component_settings.attachments_allowed? %>
+        <div class="row column">
           <legend><%= t(".attachment_legend") %></legend>
           <%= form.fields_for :attachment, @form.attachment do |form| %>
-            <div class="row column">
-              <%= form.text_field :title %>
-            </div>
-
-            <div class="row column">
-              <%= form.upload :file %>
-              <% if params[:id].present? %>
-                <% if proposal.documents.present? %>
-                  <%= form.hidden_field :id, value: proposal.documents.first.id %>
-                  <%= form.check_box :delete_file, label: t(".delete_attachment"), value: proposal.documents.first.id %>
-                <% end %>
+            <%= form.text_field :title %>
+            <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
+            <% if params[:id].present? %>
+              <% if proposal.documents.present? %>
+                <%= form.hidden_field :id, value: proposal.documents.first.id %>
+                <%= form.check_box :delete_file, label: t(".delete_attachment"), value: proposal.documents.first.id %>
               <% end %>
-            </div>
+            <% end %>
           <% end %>
-        </fieldset>
-      </div>
-    <% end %>
+        </div>
+      <% end %>
+    </div>
   </div>
 </div>
-
-<%= javascript_pack_tag "decidim_proposals_admin" %>
+<%= append_javascript_pack_tag "decidim_proposals_admin" %>

data/app/views/decidim/proposals/admin/proposals/_meetings.html.erb

@@ -0,0 +1,13 @@
+<div class="card-section">
+  <div class="row column">
+    <span class="component__show-title"><%= t "related_meetings", scope: "decidim.proposals.admin.proposals.show" %></span>
+    <ul id="related-meetings">
+      <% proposal_meetings.each do |meeting| %>
+        <% presented_meeting = present(meeting) %>
+        <li>
+          <%= link_to presented_meeting.title(html_escape: true), presented_meeting.profile_path %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/views/decidim/proposals/admin/proposals/_photos.html.erb

@@ -0,0 +1,13 @@
+<div class="card-section">
+  <div class="row column">
+    <strong><%= t("photos", scope: "decidim.proposals.admin.proposals.show") %>:</strong>
+    <div id="photos" class="gallery row" data-gallery>
+      <% proposal.photos.each do |photo| %>
+        <%= link_to photo.big_url, target: "_blank", rel: "noopener" do %>
+          <%= image_tag photo.thumbnail_url,
+                        class: "thumbnail", alt: strip_tags(translated_attribute(photo.title)) %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -2,28 +2,31 @@
   <td>
     <%= check_box_tag "proposal_ids_s[]", proposal.id, false, class: "js-check-all-proposal js-proposal-list-check  js-proposal-id-#{proposal.id}" %><br>
   </td>
-  <td>
-    <%= proposal.id %><br>
-  </td>
-  <td>
-    <%= link_to(
-      present(proposal).title(html_escape: true),
-      proposal_path(proposal)
-    ) %><br>
-  </td>
-  <td>
-    <% if proposal.category %>
-      <%= translated_attribute proposal.category.name %>
+  <td class="!text-left">
+    <% if allowed_to? :edit, :proposal, proposal: proposal %>
+      <%= link_to present(proposal).title(html_escape: true), proposal_path(proposal) %><br>
+    <% else %>
+      <%= present(proposal).title(html_escape: true) %><br>
     <% end %>
+    <div class="flex items-center gap-x-1 mt-2">
+      <% if proposal.category %>
+        <%= icon "price-tag-3-line", class: "fill-gray w-4 h-4" %>
+        <%= translated_attribute proposal.category.name %>
+      <% end %>
+      <div class="flex items-center gap-x-1">
+        <%= icon "scan-line", class: "fill-gray w-4 h-4" %>
+        <span>
+          <% if proposal.scope %>
+             <%= translated_attribute proposal.scope.name %>
+          <% else %>
+             <%= t("decidim.scopes.global") %>
+          <% end %>
+        </span>
+      </div>
+    </div>
   </td>
-
-  <%= td_resource_scope_for(proposal.scope) %>
-
-  <td>
-    <strong class="<%= proposal_state_css_class proposal %>">
-      <%= t("decidim/amendment", scope: "activerecord.models", count: 1) if proposal.emendation? %>
-      <%= proposal_complete_state proposal %>
-    </strong>
+  <td class="table-list__date">
+    <%= l proposal.published_at, format: :decidim_short %>
   </td>
 
   <% unless current_settings.publish_answers_immediately? %>
@@ -53,24 +56,27 @@
   </td>
 
   <td class="valuators-count">
-    <%= proposal.valuation_assignments.size %>
+    <%= proposal.valuation_assignments.count %>
   </td>
 
   <td>
-    <%= l proposal.created_at, format: :decidim_short %>
+    <strong class="label <%= proposal_state_css_class proposal %>">
+      <%= t("decidim/amendment", scope: "activerecord.models", count: 1) if proposal.emendation? %>
+      <%= proposal_complete_state proposal %>
+    </strong>
   </td>
 
   <td class="table-list__actions">
     <% if allowed_to? :edit, :proposal, proposal: proposal %>
-      <%= icon_link_to "pencil", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
+      <%= icon_link_to "pencil-line", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
     <% else %>
       <span class="action-space icon"></span>
     <% end %>
 
     <%= icon_with_link_to_proposal(proposal) %>
 
-    <%= resource_permissions_link(proposal) %>
+    <%= icon_link_to "eye-line", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
 
-   <%= icon_link_to "eye", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank %>
+    <%= resource_permissions_link(proposal) %>
   </td>
 </tr>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb

@@ -1,5 +1,5 @@
 <div id="js-assign-proposals-to-valuator-actions" class="hide js-bulk-action-form">
-  <%= form_tag(valuation_assignment_path, method: :post, id: "js-form-assign-proposals-to-valuator", class: "flex--cc flex-gap--1") do %>
+  <%= form_tag(valuation_assignment_path, method: :post, id: "js-form-assign-proposals-to-valuator", class: "form form-defaults flex items-center gap-x-2") do %>
     <div class="checkboxes hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
@@ -8,8 +8,8 @@
 
     <%= bulk_valuators_select(current_participatory_space, t("decidim.proposals.admin.proposals.index.assign_to_valuator")) %>
 
-    <%= submit_tag(t("decidim.proposals.admin.proposals.index.assign_to_valuator_button"), id: "js-submit-assign-proposals-to-valuator", class: "button small button--simple float-left") %>
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.assign_to_valuator_button"), id: "js-submit-assign-proposals-to-valuator", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-assign-proposals-to-valuator" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <button id="js-cancel-assign-proposals-to-valuator" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
   <% end %>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb

@@ -1,10 +1,11 @@
 <div id="js-bulk-actions-wrapper">
   <button
     id="js-bulk-actions-button"
-    class="button button--nomargin tiny success light dropdown hide"
+    class="button button__sm button__secondary"
     type="button"
     data-toggle="js-bulk-actions-dropdown">
     <%= t("decidim.proposals.admin.proposals.index.actions") %>
+    <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
   </button>
 
   <div
@@ -15,7 +16,7 @@
     data-dropdown="dropdown"
     data-auto-focus="false"
     data-events="resize">
-    <ul class="list-reset">
+    <ul>
       <li>
         <button type="button" data-action="recategorize-proposals">
           <%= t("decidim.proposals.admin.proposals.index.change_category") %>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_merge.html.erb

@@ -1,5 +1,5 @@
-<div id="js-merge-proposals-actions" class="hide js-bulk-action-form">
-  <%= form_tag(proposals_merge_path, method: :post, id: "js-form-merge-proposals", class: "flex--cc flex-gap--1") do %>
+<div id="js-merge-proposals-actions" class="js-bulk-action-form">
+  <%= form_tag(proposals_merge_path, method: :post, id: "js-form-merge-proposals", class: "form form-defaults flex items-center gap-x-2") do %>
     <div class="checkboxes hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
@@ -8,8 +8,8 @@
 
     <%= bulk_components_select((current_component.siblings + [current_component])) %>
 
-    <%= submit_tag(t("decidim.proposals.admin.proposals.index.merge_button"), id: "js-submit-merge-proposals", class: "button small button--simple float-left") %>
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.merge_button"), id: "js-submit-merge-proposals", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-merge-proposals" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <button id="js-cancel-merge-proposals" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
   <% end %>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_publish_answers.html.erb

@@ -1,5 +1,5 @@
 <div id="js-publish-answers-actions" class="hide js-bulk-action-form">
-  <%= form_tag(publish_answers_proposals_path, method: :post, remote: true, id: "js-form-publish-answers", class: "flex--cc flex-gap--1") do %>
+  <%= form_tag(publish_answers_proposals_path, method: :post, remote: true, id: "js-form-publish-answers", class: "flex align-middle text-center gap-x-4 ml-auto") do %>
     <div class="checkboxes hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
@@ -7,8 +7,8 @@
     </div>
     <p><%= t("decidim.proposals.admin.proposals.publish_answers.number_of_proposals", number: '<span id="js-form-publish-answers-number"></span>').html_safe %></p>
 
-    <%= submit_tag(t("decidim.proposals.admin.proposals.index.publish"), id: "js-submit-publish-answers", class: "button small button--simple float-left") %>
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.publish"), id: "js-submit-publish-answers", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-publish-answers" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <button id="js-cancel-publish-answers" class="button button__sm button__secondary button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
   <% end %>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_recategorize.html.erb

@@ -1,5 +1,5 @@
 <div id="js-recategorize-proposals-actions" class="hide js-bulk-action-form">
-  <%= form_tag(update_category_proposals_path, method: :post, remote: true, id: "js-form-recategorize-proposals", class: "flex--cc flex-gap--1") do %>
+  <%= form_tag(update_category_proposals_path, method: :post, remote: true, id: "js-form-recategorize-proposals", class: "form form-defaults flex items-center gap-x-2") do %>
     <div class="checkboxes hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
@@ -8,8 +8,8 @@
 
     <%= bulk_categories_select current_component.categories %>
 
-    <%= submit_tag(t("decidim.proposals.admin.proposals.index.update"), id: "js-submit-edit-category", class: "button small button--simple float-left") %>
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.update"), id: "js-submit-edit-category", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-edit-category" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <button id="js-cancel-edit-category" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
   <% end %>
 </div>