From dbf658a4a12d8f876b4739d079a37cd6c0db96c7 Mon Sep 17 00:00:00 2001 From: f Date: Mon, 4 Mar 2024 13:12:22 -0300 Subject: [PATCH] feat: poder cambiar el nivel de summary (cherry picked from commit 6110172324f6f267f5d10a1b33e2458f061ea67a) --- app/assets/stylesheets/application.scss | 7 ------- app/views/layouts/_details.haml | 6 ------ 2 files changed, 13 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 195cb662..a9bdb997 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -573,7 +573,6 @@ $bezier: cubic-bezier(0.75, 0, 0.25, 1); display: none; } } -<<<<<<< HEAD summary::after { content: '▶'; font-size: 1.8rem; @@ -583,9 +582,6 @@ $bezier: cubic-bezier(0.75, 0, 0.25, 1); transform: rotate(180deg); } -======= - ->>>>>>> 61101723 (feat: poder cambiar el nivel de summary) &[open] { & > summary { .hide-when-open { @@ -597,12 +593,9 @@ $bezier: cubic-bezier(0.75, 0, 0.25, 1); } } } -<<<<<<< HEAD } hr { border-bottom: 1px solid #dee2e6; -======= ->>>>>>> 61101723 (feat: poder cambiar el nivel de summary) } diff --git a/app/views/layouts/_details.haml b/app/views/layouts/_details.haml index 94203400..a679541a 100644 --- a/app/views/layouts/_details.haml +++ b/app/views/layouts/_details.haml @@ -1,10 +1,5 @@ -# Detail Cola de Moderación -<<<<<<< HEAD -%details.details.py-2 - %summary - %h3.py-2= summary -======= @param :id [String] El ID opcional sirve para mantener el historial de cuál estaba abierto y recuperarlo al cargar la página @param :summary [String] El resumen @@ -17,5 +12,4 @@ %span= summary %span.hide-when-open ▶ %span.show-when-open ▼ ->>>>>>> 61101723 (feat: poder cambiar el nivel de summary) = yield