help.git: Branch 'distro/collabora/co-24.04' - 2 commits - help3xsl/default.css

[Juan José González (via logerrit)]

 help3xsl/default.css |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 7fb7d1daa6a67905417d701f0f85560b8644e80e
Author:     Juan José González <juanjose...@libreoffice.org>
AuthorDate: Sun Apr 14 11:14:21 2024 -0600
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Apr 19 12:53:49 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 <olivier.hal...@libreoffice.org>
    (cherry picked from commit 2b438594148c4ee94cb632e7a3d3b64b547706d5)
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166211
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 3d66a12b1a..8f7c16ab4e 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;
commit cea3437fa87daa28f74e778200e5650d59f6779c
Author:     Juan José González <juanjose...@libreoffice.org>
AuthorDate: Wed Apr 3 20:02:09 2024 -0600
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Apr 19 12:53:49 2024 +0200

    tdf#160467 Remove z-index in prism code block
    
    Right now code renders on top of header section.
    Remove z-index to fix it.
    
    Change-Id: Ic0cf226275eae1656107de27907a94af256d5555
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165768
    Tested-by: Jenkins
    Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    (cherry picked from commit c89178e82abacbb240e571fcbd9bd0f76b40642d)
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165718

diff --git a/help3xsl/prism.css b/help3xsl/prism.css
index 4610909810..54f0bf021e 100644
--- a/help3xsl/prism.css
+++ b/help3xsl/prism.css
@@ -39,7 +39,6 @@ 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;