https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38365

--- Comment #363 from David Cook <[email protected]> ---
Getting a little merge conflict:

diff --cc koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 06fd4041770,5b793bc5cbd..00000000000
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@@ -1824,7 -1824,7 +1824,11 @@@
                              // Set the first navigation link as active
                              $(covernav).addClass("nav-active");
                          }
++<<<<<<< HEAD
 +                        $(covernav).html('<i class="fa fa-circle"
aria-hidden="true"></i>');
++=======
+                         $(covernav).html('<i class="fa fa-circle"></i>');
++>>>>>>> Bug 38365: Add CSP nonces to all inline script and style tags
                          $(coverSlide).append(covernav);
                      });
                  }

It looks like it's due to the patch "Bug 41582: (RM follow-up) Add missing
aria-hidden attribute to FA icon"

I'm guessing either Jonathan can rebase or Lucas might fix that one up?

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
[email protected]
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

Reply via email to