Remove xlarge-* references from admin forms (#11712)

decidim · Oct 16, 2023 · 67b2468 · 67b2468
1 parent 985ce79
commit 67b2468
Show file tree

Hide file tree

Showing 29 changed files with 102 additions and 93 deletions.
diff --git a/.erb-lint.yml b/.erb-lint.yml
@@ -23,6 +23,15 @@ linters:
       - text/javascript
       - text/template
 
+  DeprecatedClasses:
+    enabled: true
+    exclude:
+      - 'decidim_app-design/**/*.erb'
+    addendum: "Please remove it from code."
+    rule_set:
+      - deprecated: ['xlarge-[\w]*']
+        suggestion: "Foundation classes are deprecated."
+
   Rubocop:
     enabled: true
 

diff --git a/decidim-accountability/app/views/decidim/accountability/admin/results/_form.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/results/_form.html.erb
@@ -31,21 +31,21 @@
       <% end %>
 
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.date_field :start_date %>
         </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.date_field :end_date %>
         </div>
       </div>
 
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.select :decidim_accountability_status_id, statuses.map { |status| [translated_attribute(status.name), status.id, { "data-progress" => status.progress }] }, include_blank: true %>
         </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.number_field :progress %>
         </div>
       </div>

diff --git a/decidim-admin/app/views/decidim/admin/areas/_form.html.erb b/decidim-admin/app/views/decidim/admin/areas/_form.html.erb
@@ -5,7 +5,7 @@
         <%= form.translated :text_field, :name, aria: { label: :name } %>
       </div>
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.collection_select :area_type_id, organization_area_types, :id, :name %>
         </div>
       </div>

diff --git a/decidim-admin/app/views/decidim/admin/organization/_form.html.erb b/decidim-admin/app/views/decidim/admin/organization/_form.html.erb
@@ -2,11 +2,11 @@
   <div class="card pt-4">
     <div class="card-section">
       <div class="row column">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.text_field :name %>
         </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <div class="label--tabs">
             <label for="organization_social_handlers">
               <%= t(".social_handlers") %>

diff --git a/decidim-admin/app/views/decidim/admin/organization_appearance/_form.html.erb b/decidim-admin/app/views/decidim/admin/organization_appearance/_form.html.erb
@@ -14,11 +14,11 @@
       </div>
 
     <div class="row">
-      <div class="columns xlarge-6 slug">
+      <div class="columns slug">
         <%= form.text_field :cta_button_path, help_text: t(".cta_button_path_help_html", url: decidim_form_slug_url("", form.object.cta_button_path)) %>
       </div>
 
-      <div class="columns xlarge-6">
+      <div class="columns">
         <%= form.translated :text_field, :cta_button_text, help_text: t(".cta_button_text_help") %>
       </div>
     </div>
@@ -60,7 +60,7 @@
       </div>
 
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.upload :highlighted_content_banner_image, button_class: "button button__sm button__transparent-secondary" %>
         </div>
       </div>

diff --git a/decidim-admin/app/views/decidim/admin/participatory_space_private_users/_form.html.erb b/decidim-admin/app/views/decidim/admin/participatory_space_private_users/_form.html.erb
@@ -2,10 +2,10 @@
   <div class="card pt-4">
     <div id="panel-title" class="card-section">
       <div class="row">
-        <div class="columns xlarge-4">
+        <div class="columns">
           <%= form.text_field :name, readonly: @form.persisted? %>
         </div>
-        <div class="columns xlarge-4">
+        <div class="columns">
           <%= form.email_field :email, readonly: @form.persisted? %>
         </div>
       </div>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -23,11 +23,11 @@
       </div>
 
     <div class="row">
-      <div class="columns xlarge-6 slug">
+      <div class="columns slug">
         <%= form.text_field :slug, help_text: t(".slug_help_html", url: decidim_form_slug_url(:assemblies, form.object.slug)) %>
       </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.text_field :hashtag %>
         </div>
       </div>
@@ -102,11 +102,11 @@
 
     <div id="panel-images" class="card-section">
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
         </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
         </div>
       </div>
@@ -160,17 +160,17 @@
         <%= form.translated :text_field, :participatory_structure, aria: { label: :participatory_structure } %>
       </div>
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.translated :text_field, :meta_scope, aria: { label: :meta_scope } %>
         </div>
       </div>
 
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.translated :text_field, :developer_group, aria: { label: :developer_group } %>
         </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.translated :text_field, :local_area, aria: { label: :local_area } %>
         </div>
       </div>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb
@@ -19,13 +19,13 @@
           </div>
           <div class="card-section">
             <div class="row">
-              <div class="columns xlarge-3">
+              <div class="columns">
                 <%= form.check_box :import_categories %>
               </div>
-              <div class="columns xlarge-3">
+              <div class="columns">
                 <%= form.check_box :import_attachments %>
               </div>
-              <div class="columns xlarge-6">
+              <div class="columns">
                 <%= form.check_box :import_components %>
               </div>
             </div>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/_form.html.erb
@@ -2,13 +2,13 @@
   <div class="card pt-4">
     <div class="card-section">
       <div class="row">
-        <div class="columns xlarge-4">
+        <div class="columns">
           <%= form.text_field :name, readonly: @form.persisted? %>
         </div>
-        <div class="columns xlarge-4">
+        <div class="columns">
           <%= form.email_field :email, readonly: @form.persisted? %>
         </div>
-        <div class="columns xlarge-4">
+        <div class="columns">
           <%= form.label :role %>
           <%= select :assembly_user_role, :role, @form.roles, include_blank: false %>
         </div>

diff --git a/decidim-blogs/app/views/decidim/blogs/admin/posts/_form.html.erb b/decidim-blogs/app/views/decidim/blogs/admin/posts/_form.html.erb
@@ -14,7 +14,7 @@
         <%= form.translated :editor, :body, lines: 30, aria: { label: :body } %>
       </div>
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.datetime_field :published_at %>
         </div>
       </div>

diff --git a/decidim-conferences/app/views/decidim/conferences/admin/conference_user_roles/_form.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/conference_user_roles/_form.html.erb
@@ -2,13 +2,13 @@
   <div class="card pt-4">
     <div class="card-section">
       <div class="row">
-        <div class="columns xlarge-4">
+        <div class="columns">
           <%= form.text_field :name, readonly: @form.persisted? %>
         </div>
-        <div class="columns xlarge-4">
+        <div class="columns">
           <%= form.email_field :email, readonly: @form.persisted? %>
         </div>
-        <div class="columns xlarge-4">
+        <div class="columns">
           <%= form.label :role %>
           <%= select :conference_user_role, :role, @form.roles, include_blank: false %>
         </div>

diff --git a/decidim-conferences/app/views/decidim/conferences/admin/conferences/_form.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/conferences/_form.html.erb
@@ -23,11 +23,11 @@
       </div>
 
     <div class="row">
-      <div class="columns xlarge-6 slug">
+      <div class="columns slug">
         <%= form.text_field :slug, help_text: t(".slug_help_html", url: decidim_form_slug_url(:conferences, form.object.slug)) %>
       </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.text_field :hashtag %>
         </div>
       </div>
@@ -53,11 +53,11 @@
       </div>
 
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
         </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
         </div>
       </div>

diff --git a/decidim-conferences/app/views/decidim/conferences/admin/diplomas/_form.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/diplomas/_form.html.erb
@@ -3,13 +3,13 @@
     <div class="card-divider"></div>
     <div class="card-section">
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.upload :main_logo, button_class: "button button__sm button__transparent-secondary" %>
         </div>
       </div>
 
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.upload :signature, button_class: "button button__sm button__transparent-secondary" %>
         </div>
       </div>

diff --git a/decidim-debates/app/views/decidim/debates/admin/debates/_form.html.erb b/decidim-debates/app/views/decidim/debates/admin/debates/_form.html.erb
@@ -26,10 +26,10 @@
       </div>
 
       <div class="row column debate-fields--finite">
-        <div class="column xlarge-6">
+        <div class="column">
           <%= form.datetime_field :start_time %>
         </div>
-        <div class="column xlarge-6">
+        <div class="column">
           <%= form.datetime_field :end_time %>
         </div>
       </div>

diff --git a/decidim-elections/app/views/decidim/elections/admin/elections/_form.html.erb b/decidim-elections/app/views/decidim/elections/admin/elections/_form.html.erb
@@ -13,10 +13,10 @@
         <% announcement_message = t(".organization_time_zone", time_zone: current_organization.time_zone, time: Time.zone.now) %>
         <%= cell("decidim/announcement", announcement_message, callout_class: "warning" ) %>
 
-        <div class="column xlarge-6">
+        <div class="column">
           <%= form.datetime_field :start_time %>
         </div>
-        <div class="column xlarge-6">
+        <div class="column">
           <%= form.datetime_field :end_time %>
         </div>
       </div>

diff --git a/decidim-elections/app/views/decidim/votings/admin/votings/_form.html.erb b/decidim-elections/app/views/decidim/votings/admin/votings/_form.html.erb
@@ -19,11 +19,11 @@
       </div>
 
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.datetime_field :start_time %>
         </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.datetime_field :end_time %>
         </div>
       </div>
@@ -40,19 +40,19 @@
       </div>
 
     <div class="row">
-      <div class="columns xlarge-6 slug">
+      <div class="columns slug">
         <%= form.text_field :slug, label: t(".slug"), help_text: t(".slug_help_html", url: decidim_form_slug_url(:votings, form.object.slug)) %>
       </div>
     </div>
 
     <div class="row">
-      <div class="columns xlarge-6 show_check_census">
+      <div class="columns show_check_census">
         <%= form.check_box :show_check_census, help_text: t(".show_check_census_help") %>
       </div>
     </div>
 
     <div class="row">
-      <div class="columns xlarge-6 census_contact_information">
+      <div class="columns census_contact_information">
         <%= form.text_field :census_contact_information, label: t(".census_contact_information"), help_text: t(".census_contact_information_help") %>
       </div>
     </div>
@@ -62,11 +62,11 @@
       </div>
 
       <div class="row">
-        <div class="columns xlarge-4">
+        <div class="columns">
           <%= form.upload :banner_image, label: t(".banner_image"), button_class: "button button__sm button__transparent-secondary" %>
         </div>
 
-        <div class="columns xlarge-4">
+        <div class="columns">
           <%= form.upload :introductory_image, label: t(".introductory_image"), button_class: "button button__sm button__transparent-secondary" %>
         </div>
       </div>

diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/answers/edit.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/answers/edit.html.erb
@@ -26,11 +26,11 @@
 
             <% if @form.signature_dates_required? %>
               <div class="row">
-                <div class="columns xlarge-6">
+                <div class="columns">
                   <%= f.date_field :signature_start_date, disabled: !@form.signature_dates_required? %>
                 </div>
 
-                <div class="columns xlarge-6">
+                <div class="columns">
                   <%= f.date_field :signature_end_date, disabled: !@form.signature_dates_required? %>
                 </div>
               </div>