0 files changed

New commits:
commit 8fcf87869259da12d62376ab27190a97439342f6
Merge: 7356d60bbf e092c75ce9
Author:     Thorsten Behrens <[email protected]>
AuthorDate: Fri Jun 7 22:45:06 2024 +0200
Commit:     Thorsten Behrens <[email protected]>
CommitDate: Fri Jun 7 22:45:06 2024 +0200

    Merge tag 'libreoffice-24.2.4.2' into feature/cib_contract49c
    
    Tag libreoffice-24.2.4.2
    
    Change-Id: I8bc15e9d7d55bba12b4036f6057dd2b9a52b042a

commit e092c75ce969766ff57af50f9d9e48d85ea71498
Author:     Christian Lohmaier <[email protected]>
AuthorDate: Tue Jun 4 12:40:46 2024 +0200
Commit:     Christian Lohmaier <[email protected]>
CommitDate: Tue Jun 4 12:40:46 2024 +0200

    Version 24.2.4.2, tag libreoffice-24.2.4.2
    
    Change-Id: I514d5ff138c6c440bfd261ac2074e5d41df671f4
commit 9428eb8af362dfb31d0b2285734bf34af41a5d84
Author:     Christian Lohmaier <[email protected]>
AuthorDate: Tue May 21 21:29:05 2024 +0200
Commit:     Christian Lohmaier <[email protected]>
CommitDate: Tue May 21 21:29:05 2024 +0200

    Branch libreoffice-24-2-4
    
    This is 'libreoffice-24-2-4' - the stable branch for the 24.2.4 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 24.2.x release,
    please use the 'libreoffice-24-2' branch.
    
    If you want to build something cool, unstable, and risky, use master.
    
    Change-Id: I6d693e6cac1747e20011b143e8c9cf9f3cadb5cd
commit 83b1b76cb72845dd5d605337cb8253b914086911
Author:     Juan José González <[email protected]>
AuthorDate: Sun Apr 14 11:14:21 2024 -0600
Commit:     Adolfo Jayme Barrientos <[email protected]>
CommitDate: Thu Apr 18 07:26:34 2024 +0200

    Move z-index rule to CSS stylesheet we control
    
    Previously a fix was pushed to prism css file, which can
    be changed by the upstream project. Instead overwrite the
    rule in our files.
    
    Change-Id: I549b05d4a359343ae0fe09831644a2eed8fb0474
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166076
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <[email protected]>
    (cherry picked from commit 2b438594148c4ee94cb632e7a3d3b64b547706d5)
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166211
    Reviewed-by: Adolfo Jayme Barrientos <[email protected]>

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 5bcd2c28f1..2a1fb17cb8 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -190,6 +190,10 @@ code[class*="language-"], pre[class*="language-"] {
     white-space: pre-wrap;
 }
 
+pre[class*="language-"] > code {
+    z-index: 0;
+}
+
 /* Table related classes */
 
 /* Special case of table with one cell*/
diff --git a/help3xsl/prism.css b/help3xsl/prism.css
index 54f0bf021e..4610909810 100644
--- a/help3xsl/prism.css
+++ b/help3xsl/prism.css
@@ -39,6 +39,7 @@ pre[class*="language-"] {
 
 pre[class*="language-"] > code {
        position: relative;
+       z-index: 1;
        border-left: 10px solid #358ccb;
        box-shadow: -1px 0px 0px 0px #358ccb, 0px 0px 0px 1px #dfdfdf;
        background-color: #fdfdfd;

Reply via email to