Merge branch 'issue-14966' of 0xacab.org:sutty/sutty into issue-15109-1

app/views/components/_block_list.haml

@@ -4,5 +4,5 @@
     .d-flex.flex-row
       = render 'components/checkbox', id: state.id, checked: state.enabled? do
         %span.h4= blocklist.title
-        %p
+        %p.mb-0
           %a{ href: blocklist.url }= t('.more')

app/views/moderation_queue/_comment.haml

@@ -1,27 +1,27 @@
 -# Componente Comentario
-.flex.mx-4.my-4
+
-  .row.no-gutters
+.row.no-gutters
-    .col-1
+  .col-1
-      = render 'components/checkbox', id: comment['id']
+    = render 'components/checkbox', id: comment['id']
-    .col-11
+  .col-11
-      .row.no-gutters
+    .row.no-gutters
-        .col.col-lg-10.d-inline-flex.justify-content-between
+      .col.col-lg-10.d-inline-flex.justify-content-between
-          %h4
+        %h4
-            %a{ href: comment['attributedTo'] }= profile['preferredUsername']
+          %a{ href: comment['attributedTo'] }= profile['preferredUsername']
-          = render 'layouts/time', time: comment['published']
+        = render 'layouts/time', time: comment['published']
-      - if comment['inReplyTo']
+    - if comment['inReplyTo']
-        .row.no-gutters
-          .col.p-0
-            %p
-              %span= t('.reply_to')
-              %span
-                %a{ href: comment['inReplyTo'] }= comment['inReplyTo']
       .row.no-gutters
         .col.p-0
-          - if comment['summary']
+          %p
-            - summary = comment['summary']
+            %span= t('.reply_to')
-            = render 'layouts/details', summary: summary do
+            %span
-              %p= comment['content'].html_safe
+              %a{ href: comment['inReplyTo'] }= comment['inReplyTo']
-          - else 
+    .row.no-gutters
+      .col.p-0
+        - if comment['summary']
+          - summary = comment['summary']
+          = render 'layouts/details', summary: summary do
             %p= comment['content'].html_safe
+        - else 
+          %p= comment['content'].html_safe
 

app/views/moderation_queue/_comments.haml

@@ -1,7 +1,7 @@
 .row.no-gutters.pt-2
   .col-1.d-flex.align-items-center
     = render 'components/checkbox', id: moderation_queue.first['id']
-  .col-11
+  .col-md-9
     -# Filtros
     = render 'components/comments_filters'
 

app/views/posts/_moderation_queue.haml

@@ -6,6 +6,7 @@
     = render 'components/comments_filters'
 
 - moderation_queue.each do |comment|
+  %hr
   = render 'moderation_queue/comment', comment: comment, profile: comment['attributedTo']
     
   -# Botones moderación

config/locales/es.yml

@@ -125,7 +125,7 @@ es:
       title:  Mis listas de bloqueo
       description: Descripción de listas de bloqueo
       custom_block: Lista personalizada de bloqueo
-      submit: Guardar lista de bloqueo
+      submit: Guardar listas de bloqueo
     instance:
       users: "Usuaries:"
   dark: Oscuro